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

Revert "openexr, imlbase: unbreak on macOS"

Browse Source 
To avoid merge conflict.

This reverts commit 8532d16e3d.
This commit is contained in:
Frederik Rietdijk 2020-05-02 09:33:06 +02:00
parent 285bd2642b
commit f855e59192
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/ilmbase/default.nix
View File

@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
./bootstrap ./bootstrap
''; '';
# otherwise, the pkgconfig info for the libraries will not match the filenames
configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no";
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ automake autoconf libtool which ]; nativeBuildInputs = [ automake autoconf libtool which ];

3
pkgs/development/libraries/openexr/default.nix
View File

@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
./bootstrap ./bootstrap
''; '';
# otherwise, the pkgconfig info for the libraries will not match the filenames
configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no";
nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
propagatedBuildInputs = [ ilmbase zlib ]; propagatedBuildInputs = [ ilmbase zlib ];