diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 10:10:40 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 10:10:40 +0100 |
commit | 2219e2578e73751eba538c416902a27ee4cd0ac9 (patch) | |
tree | 0674019e3b7e3ec693eededa75bb2d36ec2ec6d3 /pkgs/build-support | |
parent | ad1abb2824b46deb74ed6da45ce1961f6684677f (diff) | |
parent | 90720d0139feaf7421344073430d2a6f5ecbb231 (diff) | |
download | nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.gz nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.bz2 nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.lz nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.xz nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.zst nixlib-2219e2578e73751eba538c416902a27ee4cd0ac9.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/rust/default.nix | 10 | ||||
-rw-r--r-- | pkgs/build-support/rust/fetchcargo.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/rust/make-rust-platform.nix | 18 |
4 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 163294cab1f8..620ea530fc55 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation { /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" - else if targetPlatform.isi686 then "i386" + else if targetPlatform.isx86 then "i386" else if targetPlatform.isMips then { "mips" = "btsmipn32"; # n32 variant "mipsel" = "ltsmipn32"; # n32 variant diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 5fdcf520440e..43aecdef5f2e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,9 +1,5 @@ -{ stdenv, cacert, git, rust, cargo-vendor, python3 }: -let - fetchcargo = import ./fetchcargo.nix { - inherit stdenv cacert git rust cargo-vendor python3; - }; -in +{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: + { name, cargoSha256 ? "unset" , src ? null , srcs ? null @@ -45,7 +41,7 @@ in stdenv.mkDerivation (args // { patchRegistryDeps = ./patch-registry-deps; - buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs; + buildInputs = [ cacert git cargo rustc ] ++ buildInputs; patches = cargoPatches ++ patches; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 9e77f8817b24..c23fa66ef9f0 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, rust, cargo-vendor, python3 }: +{ stdenv, cacert, git, cargo, cargo-vendor, python3 }: let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; @@ -20,7 +20,7 @@ in { name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; - nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise rust.cargo ]; + nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ]; inherit src srcs patches sourceRoot; phases = "unpackPhase patchPhase installPhase"; diff --git a/pkgs/build-support/rust/make-rust-platform.nix b/pkgs/build-support/rust/make-rust-platform.nix new file mode 100644 index 000000000000..afbc56865ff7 --- /dev/null +++ b/pkgs/build-support/rust/make-rust-platform.nix @@ -0,0 +1,18 @@ +{ callPackage }: +{ rustc, cargo, ... }: { + rust = { + inherit rustc cargo; + }; + + buildRustPackage = callPackage ./default.nix { + inherit rustc cargo; + + fetchcargo = callPackage ./fetchcargo.nix { + inherit cargo; + }; + }; + + rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix { + inherit rustc; + }; +} |