diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
| commit | e9aeb55f3bc5206606ca22db8ad01bcabb8118a4 (patch) | |
| tree | 48b3c280de3eb20282b583276eaf49b6fd511f23 /pkgs/stdenv | |
| parent | 71a7e221d8f0def852f3a692daa3904a50523b30 (diff) | |
| parent | 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (diff) | |
| download | nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.gz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.bz2 nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.lz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.xz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.zst nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index a8c1e8002028..77471e6dfdbe 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -63,7 +63,7 @@ let }; scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec { - platform = pkgsNoParams.platforms.scaleway-c1; + platform = lib.systems.platforms.scaleway-c1; inherit (platform) gcc; inherit (gcc) fpu; }; @@ -73,9 +73,9 @@ let config = "armv5tel-softfloat-linux-gnueabi"; float = "soft"; - platform = pkgsNoParams.platforms.pogoplug4; + platform = lib.systems.platforms.pogoplug4; - inherit (pkgsNoParams.platforms.pogoplug4) gcc; + inherit (lib.systems.platforms.pogoplug4) gcc; libc = "glibc"; withTLS = true; @@ -146,11 +146,11 @@ rec { build = - pkgs.buildPackages.stdenv.mkDerivation { + pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; crossConfig = pkgs.hostPlatform.config; - buildInputs = [ + nativeBuildInputs = [ pkgs.buildPackages.nukeReferences pkgs.buildPackages.cpio pkgs.buildPackages.binutils @@ -285,7 +285,7 @@ rec { allowedReferences = []; }; - dist = pkgs.buildPackages.stdenv.mkDerivation { + dist = pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; buildCommand = '' |