bootstrap-tools: Introduce getLib for lib outputs

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

authored by toonn sternenseemann Jörg Thalheim and committed by Jonathan Ringer 77fc5f8c 7e9d4428

+14 -14
+14 -14
pkgs/stdenv/darwin/make-bootstrap-tools.nix
··· 43 43 44 44 ${lib.optionalString stdenv.targetPlatform.isx86_64 '' 45 45 # Copy libSystem's .o files for various low-level boot stuff. 46 - cp -d ${darwin.Libsystem}/lib/*.o $out/lib 46 + cp -d ${lib.getLib darwin.Libsystem}/lib/*.o $out/lib 47 47 48 48 # Resolv is actually a link to another package, so let's copy it properly 49 - cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib 49 + cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib 50 50 51 51 cp -rL ${darwin.Libsystem}/include $out 52 52 chmod -R u+w $out/include ··· 84 84 85 85 cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib 86 86 cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib 87 - cp -d ${gettext}/lib/libintl*.dylib $out/lib 87 + cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib 88 88 chmod +x $out/lib/libintl*.dylib 89 89 cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib 90 90 cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib 91 91 92 92 # Copy what we need of clang 93 93 cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin 94 - cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib 94 + cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib 95 95 96 - cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib 97 - cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib 98 - cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin 99 - cp -d ${llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib 100 - cp -d ${llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib 101 - cp -d ${libffi}/lib/libffi*.dylib $out/lib 96 + cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib 97 + cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib 98 + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin 99 + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib 100 + cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib 101 + cp -d ${lib.getLib libffi}/lib/libffi*.dylib $out/lib 102 102 103 103 mkdir $out/include 104 104 cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include ··· 106 106 ${lib.optionalString targetPlatform.isAarch64 '' 107 107 # copy .tbd assembly utils 108 108 cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin 109 - cp -d ${pkgs.libyaml}/lib/libyaml*.dylib $out/lib 109 + cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib 110 110 111 111 # copy package extraction tools 112 112 cp -d ${pkgs.pbzx}/bin/pbzx $out/bin 113 - cp -d ${pkgs.xar}/lib/libxar*.dylib $out/lib 113 + cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib 114 114 cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib 115 115 116 116 # copy sigtool ··· 118 118 cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin 119 119 ''} 120 120 121 - cp -d ${darwin.ICU}/lib/libicu*.dylib $out/lib 121 + cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib 122 122 cp -d ${zlib.out}/lib/libz.* $out/lib 123 123 cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib 124 124 cp -d ${xz.out}/lib/liblzma*.* $out/lib ··· 128 128 cp ${cctools_}/bin/$i $out/bin 129 129 done 130 130 131 - cp -d ${darwin.libtapi}/lib/libtapi* $out/lib 131 + cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib 132 132 133 133 ${lib.optionalString targetPlatform.isx86_64 '' 134 134 cp -rd ${pkgs.darwin.CF}/Library $out