diff options
author | Andrew Childs <lorne@cons.org.nz> | 2020-10-13 16:03:49 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2020-10-21 13:26:53 +0900 |
commit | 722d02a720124e55bf0bc0c6b4c4d6f4dc70d096 (patch) | |
tree | 7ea2e7b195ef8f027f8d25fb4b99952187c3805f /pkgs/development/libraries | |
parent | 2a905c8616662b0e5fd5d4d3979ac4a3bc914b15 (diff) | |
download | nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.gz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.bz2 nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.lz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.xz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.zst nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.zip |
treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing install_name_tool from binutils.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/atk/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/icu/base.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/json-glib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/leveldb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libLAS/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libevent/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/nss/3.44.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/nss/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/odpic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/tiledb/default.nix | 4 |
14 files changed, 28 insertions, 27 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b54ba531301..aa132515b3e 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6d1c20f323d..cb7a1f01788 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -145,11 +145,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu - ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python ++ optional enableNumpy python.pkgs.numpy; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 1ffb5359992..cd3fa3bb7fd 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ openssl db gettext kerberos ] ++ lib.optional enableLdap openldap diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 08b8f70b2d9..1c248d94fb6 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -60,9 +60,7 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin [ - fixDarwinDylibNames - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 1b9fcb9586b..fbc1cb818ca 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libGL ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 81f75ad526a..d8e9bd16ab8 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -57,7 +57,7 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 4ae4a71091e..f89d4bc4534 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 33eca603c26..14d426701ba 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildPhase = '' make all diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 95569c0a813..27db14e7166 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e23c7d55c5e..cbde3206717 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional sslSupport "openssl" ; + nativeBuildInputs = [] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ; + buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; doCheck = false; # needs the net diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix index ad58bfccaee..1c89dd79331 100644 --- a/pkgs/development/libraries/nss/3.44.nix +++ b/pkgs/development/libraries/nss/3.44.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e9ca475802d..395617aa7bc 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -20,10 +20,9 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 6c3744493d2..7f27f7d1c17 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 2726ed7f237..89318dd4e75 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmake python doxygen - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; checkInputs = [ gtest @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; # emulate the process of pulling catch down postPatch = '' |