diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 08:21:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 08:21:54 +0200 |
| commit | a12aeebedbac1bbb02d1beec35925c433cf022f5 (patch) | |
| tree | 6e552607f0193d0d1fb91d6cd2e2037de5e6462d /pkgs/applications/graphics | |
| parent | fbf4028074d449d159297400730d67838fcbf5b8 (diff) | |
| parent | 5e32d10aeb74836da322905a0d18839dc3d439e3 (diff) | |
| download | nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.gz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.bz2 nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.lz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.xz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.zst nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openimageio/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/openimageio/default.nix | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 837446190fb..8644341ec21 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 00b33b65216..7225efadebd 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PYTHON=OFF" - # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; makeFlags = [ |