pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31125 from LnL7/darwin-rust-bootstrap

rust-bootstrap: cleanup darwin expression

authored by

Daiderd Jordan and committed by
GitHub ccf7310e b7734b61

+38 -26
unified split
+35 -22
pkgs/development/compilers/rust/binaryBuild.nix
··· 1 - { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl 2 , version 3 , src 4 , platform ··· 6 }: 7 8 let 9 - inherit (stdenv.lib) optionalString; 10 11 - needsPatchelf = stdenv.isLinux; 12 13 - bootstrapping = versionType == "bootstrap"; 14 15 installComponents 16 = "rustc,rust-std-${platform}" ··· 34 license = [ licenses.mit licenses.asl20 ]; 35 }; 36 37 - phases = ["unpackPhase" "installPhase"]; 38 39 installPhase = '' 40 ./install.sh --prefix=$out \ 41 --components=${installComponents} 42 43 - ${optionalString (needsPatchelf && bootstrapping) '' 44 patchelf \ 45 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 46 - "$out/bin/rustdoc" 47 patchelf \ 48 - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ 49 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 50 - "$out/bin/cargo" 51 ''} 52 53 - ${optionalString needsPatchelf '' 54 - patchelf \ 55 - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 56 - "$out/bin/rustc" 57 58 # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc 59 # (or similar) here. It causes strange effects where rustc loads 60 # the wrong libraries in a bootstrap-build causing failures that 61 # are very hard to track dow. For details, see 62 # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 63 - ''} 64 ''; 65 - 66 }; 67 68 cargo = stdenv.mkDerivation rec { ··· 78 license = [ licenses.mit licenses.asl20 ]; 79 }; 80 81 buildInputs = [ makeWrapper ]; 82 - phases = ["unpackPhase" "installPhase"]; 83 84 installPhase = '' 85 ./install.sh --prefix=$out \ 86 --components=cargo 87 88 - ${optionalString needsPatchelf '' 89 - patchelf \ 90 - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ 91 - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 92 - "$out/bin/cargo" 93 - ''} 94 95 wrapProgram "$out/bin/cargo" \ 96 --suffix PATH : "${rustc}/bin"
··· 1 + { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl, darwin 2 , version 3 , src 4 , platform ··· 6 }: 7 8 let 9 + inherit (stdenv.lib) getLib optionalString; 10 + inherit (darwin) libiconv; 11 + inherit (darwin.apple_sdk.frameworks) Security; 12 13 + bootstrapping = versionType == "bootstrap"; 14 15 + patchBootstrapCargo = '' 16 + ${optionalString (stdenv.isLinux && bootstrapping) '' 17 + patchelf \ 18 + --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ 19 + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 20 + "$out/bin/cargo" 21 + ''} 22 + ${optionalString (stdenv.isDarwin && bootstrapping) '' 23 + install_name_tool \ 24 + -change /usr/lib/libiconv.2.dylib '${getLib libiconv}/lib/libiconv.2.dylib' \ 25 + "$out/bin/cargo" 26 + install_name_tool \ 27 + -change /usr/lib/libcurl.4.dylib '${getLib curl}/lib/libcurl.4.dylib' \ 28 + "$out/bin/cargo" 29 + install_name_tool \ 30 + -change /usr/lib/libz.1.dylib '${getLib zlib}/lib/libz.1.dylib' \ 31 + "$out/bin/cargo" 32 + ''} 33 + ''; 34 35 installComponents 36 = "rustc,rust-std-${platform}" ··· 54 license = [ licenses.mit licenses.asl20 ]; 55 }; 56 57 + phases = ["unpackPhase" "installPhase" "fixupPhase"]; 58 + 59 + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; 60 61 installPhase = '' 62 ./install.sh --prefix=$out \ 63 --components=${installComponents} 64 65 + ${optionalString (stdenv.isLinux && bootstrapping) '' 66 patchelf \ 67 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 68 + "$out/bin/rustc" 69 patchelf \ 70 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ 71 + "$out/bin/rustdoc" 72 ''} 73 74 + ${patchBootstrapCargo} 75 76 # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc 77 # (or similar) here. It causes strange effects where rustc loads 78 # the wrong libraries in a bootstrap-build causing failures that 79 # are very hard to track dow. For details, see 80 # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 81 ''; 82 }; 83 84 cargo = stdenv.mkDerivation rec { ··· 94 license = [ licenses.mit licenses.asl20 ]; 95 }; 96 97 + phases = ["unpackPhase" "installPhase" "fixupPhase"]; 98 + 99 buildInputs = [ makeWrapper ]; 100 + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; 101 102 installPhase = '' 103 ./install.sh --prefix=$out \ 104 --components=cargo 105 106 + ${patchBootstrapCargo} 107 108 wrapProgram "$out/bin/cargo" \ 109 --suffix PATH : "${rustc}/bin"
+3 -4
pkgs/development/compilers/rust/bootstrap.nix
··· 1 - { stdenv, fetchurl, makeWrapper, cacert, zlib, curl }: 2 3 let 4 # Note: the version MUST be one version prior to the version we're ··· 29 sha256 = hashes."${platform}"; 30 }; 31 32 - in import ./binaryBuild.nix 33 - { inherit stdenv fetchurl makeWrapper cacert zlib curl; 34 buildRustPackage = null; 35 - inherit version src platform; 36 versionType = "bootstrap"; 37 }
··· 1 + { stdenv, fetchurl, callPackage }: 2 3 let 4 # Note: the version MUST be one version prior to the version we're ··· 29 sha256 = hashes."${platform}"; 30 }; 31 32 + in callPackage ./binaryBuild.nix 33 + { inherit version src platform; 34 buildRustPackage = null; 35 versionType = "bootstrap"; 36 }