diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
| commit | 6ed0fe7e450def967685ec11b789bfe32002d1c1 (patch) | |
| tree | 409bf318be731969061398dc5a11c5d3c360484f /pkgs/build-support/fetchbower/default.nix | |
| parent | c08042ba4b507cc0d494b1b9ca0895cc25db83d4 (diff) | |
| parent | b986078593af4108371c210ce0106b6b3e82ee20 (diff) | |
| download | nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.gz nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.bz2 nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.lz nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.xz nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.zst nixpkgs-6ed0fe7e450def967685ec11b789bfe32002d1c1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/build-support/fetchbower/default.nix pkgs/build-support/fetchdarcs/default.nix pkgs/build-support/fetchgx/default.nix pkgs/development/python-modules/botocore/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/tools/admin/awscli/default.nix
Diffstat (limited to 'pkgs/build-support/fetchbower/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchbower/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index ba1c8420e91..fd971d431df 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bower2nix, cacert }: +{ stdenvNoCC, lib, bower2nix, cacert }: let bowerVersion = version: let @@ -9,7 +9,7 @@ let cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; - fetchbower = name: version: target: outputHash: stdenv.mkDerivation { + fetchbower = name: version: target: outputHash: stdenvNoCC.mkDerivation { name = "${cleanName name}-${bowerVersion version}"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" @@ -22,7 +22,7 @@ let outputHashMode = "recursive"; outputHashAlgo = "sha256"; inherit outputHash; - buildInputs = [ cacert bower2nix ]; + nativeBuildInputs = [ bower2nix cacert ]; }; in fetchbower |