Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: move fixDarwinDylibNames to nativeBuildInputs #100388

Merged
merged 2 commits into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/applications/graphics/graphicsmagick/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/klayout/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch
, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
, which, perl, makeWrapper, fixDarwinDylibNames
, which, perl, makeWrapper
}:

mkDerivation rec {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/science/logic/z3/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/dmd/binary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/ldc/binary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];

Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/10/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/compilers/llvm/10/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/11/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/5/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/5/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/6/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/6/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/7/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 5 additions & 2 deletions pkgs/development/compilers/llvm/7/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/8/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/compilers/llvm/8/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/9/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/compilers/llvm/9/libc++/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/libraries/atk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/libraries/cyrus-sasl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/libraries/gdk-pixbuf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/libraries/glfw/3.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/icu/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/json-glib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/leveldb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libLAS/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/libraries/libevent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/nss/3.44.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];

Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/libraries/nss/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/odpic/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
Loading