diff options
| author | toonn <toonn@toonn.io> | 2021-06-01 20:26:42 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-24 15:17:13 -0800 |
| commit | 77fc5f8c14f797fe2db78b8d1635dba4e81769db (patch) | |
| tree | 766d99b178ffdaf8b8127abc55765592144d1ec9 /pkgs/stdenv | |
| parent | 7e9d4428373f780aed525bb5fc4d25d9d1117421 (diff) | |
| download | nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar.gz nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar.bz2 nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar.lz nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar.xz nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.tar.zst nixpkgs-77fc5f8c14f797fe2db78b8d1635dba4e81769db.zip | |
bootstrap-tools: Introduce getLib for lib outputs
Co-authored-by: sternenseemann <sternenseemann@systemli.org> Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 34578ecfba8..49f884cd8b3 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -43,10 +43,10 @@ in rec { ${lib.optionalString stdenv.targetPlatform.isx86_64 '' # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${darwin.Libsystem}/lib/*.o $out/lib + cp -d ${lib.getLib darwin.Libsystem}/lib/*.o $out/lib # Resolv is actually a link to another package, so let's copy it properly - cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib cp -rL ${darwin.Libsystem}/include $out chmod -R u+w $out/include @@ -84,21 +84,21 @@ in rec { cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib - cp -d ${gettext}/lib/libintl*.dylib $out/lib + cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib chmod +x $out/lib/libintl*.dylib cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib # Copy what we need of clang cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin - cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib + cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib - cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib - cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib - cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin - cp -d ${llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib - cp -d ${llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib - cp -d ${libffi}/lib/libffi*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib + cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib + cp -d ${lib.getLib libffi}/lib/libffi*.dylib $out/lib mkdir $out/include cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include @@ -106,11 +106,11 @@ in rec { ${lib.optionalString targetPlatform.isAarch64 '' # copy .tbd assembly utils cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${pkgs.libyaml}/lib/libyaml*.dylib $out/lib + cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib # copy package extraction tools cp -d ${pkgs.pbzx}/bin/pbzx $out/bin - cp -d ${pkgs.xar}/lib/libxar*.dylib $out/lib + cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib # copy sigtool @@ -118,7 +118,7 @@ in rec { cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin ''} - cp -d ${darwin.ICU}/lib/libicu*.dylib $out/lib + cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib cp -d ${xz.out}/lib/liblzma*.* $out/lib @@ -128,7 +128,7 @@ in rec { cp ${cctools_}/bin/$i $out/bin done - cp -d ${darwin.libtapi}/lib/libtapi* $out/lib + cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib ${lib.optionalString targetPlatform.isx86_64 '' cp -rd ${pkgs.darwin.CF}/Library $out |