public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/appleseed/default.nix
+4 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile,
{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
eigen, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper
}:
@@ -18,10 +18,11 @@ in stdenv.mkDerivation rec {
rev = version;
sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
cmake pkgconfig boost_static guile eigen libpng python
boost_static guile eigen libpng python
libGLU qt4 openexr openimageio opencolorio xercesc
osl seexpr makeWrapper
osl seexpr
];
NIX_CFLAGS_COMPILE = toString [
pkgs/tools/graphics/gromit-mpx/default.nix
+2 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
{ stdenv, fetchFromGitHub, cmake, pkg-config
, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu
, wrapGAppsHook
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
buildInputs = [
cmake
gtk glib pcre libappindicator libpthreadstubs
libXdmcp libxkbcommon epoxy at-spi2-core
dbus libdbusmenu
pkgs/tools/graphics/luxcorerender/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36
{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
@@ -30,17 +30,17 @@ in stdenv.mkDerivation {
inherit sha256;
};
nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ];
buildInputs =
[ embree2 pkgconfig cmake zlib boost_static libjpeg
[ embree2 zlib boost_static libjpeg
libtiff libpng ilmbase freetype openexr openimageio
tbb qt5.full c-blosc libGLU pcre bison
flex libX11 libpthreadstubs python libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
tbb qt5.full c-blosc libGLU pcre
libX11 libpthreadstubs python libXdmcp libxkbcommon
epoxy at-spi2-core dbus
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
makeWrapper
(stdenv.lib.getLib dconf)
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
pkgs/tools/graphics/yafaray-core/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib
{ stdenv, fetchFromGitHub, cmake, pkg-config, opencv, zlib
, libxml2, freetype, libjpeg, libtiff, swig, openexr
, ilmbase, boost165
, withPython ? true, python3
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff
boost165 opencv zlib libxml2 freetype libjpeg libtiff
swig openexr ilmbase
] ++ stdenv.lib.optional withPython python3;