treewide: move fixDarwinDylibNames to nativeBuildInputs

This hook runs at build time and depends on executing
install_name_tool from binutils.
wip/yesman
Andrew Childs 4 years ago
parent 2a905c8616
commit 722d02a720
  1. 6
      pkgs/applications/graphics/graphicsmagick/default.nix
  2. 2
      pkgs/applications/misc/klayout/default.nix
  3. 3
      pkgs/applications/science/logic/z3/default.nix
  4. 3
      pkgs/development/compilers/dmd/binary.nix
  5. 3
      pkgs/development/compilers/ldc/binary.nix
  6. 6
      pkgs/development/compilers/llvm/10/clang/default.nix
  7. 5
      pkgs/development/compilers/llvm/10/libc++/default.nix
  8. 6
      pkgs/development/compilers/llvm/11/clang/default.nix
  9. 6
      pkgs/development/compilers/llvm/5/clang/default.nix
  10. 6
      pkgs/development/compilers/llvm/5/libc++/default.nix
  11. 6
      pkgs/development/compilers/llvm/6/clang/default.nix
  12. 6
      pkgs/development/compilers/llvm/6/libc++/default.nix
  13. 6
      pkgs/development/compilers/llvm/7/clang/default.nix
  14. 7
      pkgs/development/compilers/llvm/7/libc++/default.nix
  15. 6
      pkgs/development/compilers/llvm/8/clang/default.nix
  16. 5
      pkgs/development/compilers/llvm/8/libc++/default.nix
  17. 6
      pkgs/development/compilers/llvm/9/clang/default.nix
  18. 5
      pkgs/development/compilers/llvm/9/libc++/default.nix
  19. 5
      pkgs/development/libraries/atk/default.nix
  20. 4
      pkgs/development/libraries/boost/generic.nix
  21. 3
      pkgs/development/libraries/cyrus-sasl/default.nix
  22. 4
      pkgs/development/libraries/gdk-pixbuf/default.nix
  23. 5
      pkgs/development/libraries/glfw/3.x.nix
  24. 2
      pkgs/development/libraries/icu/base.nix
  25. 4
      pkgs/development/libraries/json-glib/default.nix
  26. 2
      pkgs/development/libraries/leveldb/default.nix
  27. 4
      pkgs/development/libraries/libLAS/default.nix
  28. 5
      pkgs/development/libraries/libevent/default.nix
  29. 6
      pkgs/development/libraries/nss/3.44.nix
  30. 5
      pkgs/development/libraries/nss/default.nix
  31. 2
      pkgs/development/libraries/odpic/default.nix
  32. 4
      pkgs/development/libraries/tiledb/default.nix
  33. 5
      pkgs/development/tools/misc/ycmd/default.nix
  34. 4
      pkgs/misc/sndio/default.nix
  35. 5
      pkgs/servers/sql/mariadb/default.nix
  36. 4
      pkgs/tools/security/sudolikeaboss/default.nix

@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
zlib libtool libwebp
]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
];
nativeBuildInputs = [ xz ];
nativeBuildInputs = [ xz ]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
postInstall = ''
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*

@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch
, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
, which, perl, makeWrapper, fixDarwinDylibNames
, which, perl, makeWrapper
}:
mkDerivation rec {

@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx";
};
buildInputs = [ python fixDarwinDylibNames ]
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ python ]
++ optional javaBindings jdk
++ optionals ocamlBindings [ ocaml findlib zarith ]
;

@ -17,7 +17,8 @@ in mkDerivation {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ];
nativeBuildInputs = [ autoPatchelfHook ]
++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc;
installPhase = ''

@ -17,7 +17,8 @@ in mkDerivation {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ];
nativeBuildInputs = [ autoPatchelfHook ]
++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ];

@ -19,10 +19,10 @@ let
'';
nativeBuildInputs = [ cmake python3 lld ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++14"

@ -21,9 +21,10 @@ stdenv.mkDerivation {
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -20,10 +20,10 @@ let
'';
nativeBuildInputs = [ cmake python3 lld ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++14"

@ -19,10 +19,10 @@ let
'';
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"

@ -25,9 +25,11 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -19,10 +19,10 @@ let
'';
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"

@ -25,9 +25,11 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -20,10 +20,10 @@ let
'';
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"

@ -24,9 +24,12 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ;
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -20,10 +20,10 @@ let
'';
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"

@ -25,9 +25,10 @@ stdenv.mkDerivation {
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -20,10 +20,10 @@ let
'';
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 llvm lld ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"

@ -21,9 +21,10 @@ stdenv.mkDerivation {
patchShebangs utils/cat_files.py
'';
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

@ -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

@ -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;

@ -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

@ -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

@ -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" ];

@ -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 ''

@ -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" ];

@ -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

@ -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"

@ -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

@ -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 ];

@ -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 ];

@ -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 ];

@ -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 = ''

@ -18,9 +18,10 @@ stdenv.mkDerivation {
sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost llvmPackages.libclang ]
++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ];
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa;
buildPhase = ''
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "sndio";
version = "1.7.0";
enableParallelBuilding = true;
buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]
++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib;
src = fetchurl {
url = "http://www.sndio.org/sndio-${version}.tar.gz";

@ -34,12 +34,13 @@ common = rec { # attributes common to both builds
name = "mariadb-${version}.tar.gz";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ]
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [
ncurses openssl zlib pcre libiconv curl
] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]
++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];

@ -19,9 +19,11 @@ buildGoPackage rec {
propagatedBuildInputs = with darwin.apple_sdk.frameworks; [
Cocoa
fixDarwinDylibNames
];
propagatedNativeBuildInputs =
stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
meta = with stdenv.lib; {
inherit version;
inherit (src.meta) homepage;

Loading…
Cancel
Save