From f855e591929018eb7ad2e3532960b52d122a7f77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 May 2020 09:33:06 +0200 Subject: [PATCH] Revert "openexr, imlbase: unbreak on macOS" To avoid merge conflict. This reverts commit 8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342. --- pkgs/development/libraries/ilmbase/default.nix | 3 --- pkgs/development/libraries/openexr/default.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 0244725177e6..4ea16a59e8b4 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { ./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 ]; nativeBuildInputs = [ automake autoconf libtool which ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 81a5ab1db992..da8fb4294650 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { ./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 ]; propagatedBuildInputs = [ ilmbase zlib ];