diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/build-support/fetchbower/default.nix | |
parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
download | nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/build-support/fetchbower/default.nix')
-rw-r--r-- | pkgs/build-support/fetchbower/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 11af6dbedf1..7c6b1a8a098 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,9 +1,11 @@ { stdenv, fetch-bower, git }: name: version: target: outputHash: stdenv.mkDerivation { name = "${name}-${version}"; - realBuilder = "${fetch-bower}/bin/fetch-bower"; - args = [ name version target ]; + buildCommand = '' + out=$PWD/out fetch-bower ${name} ${version} ${target} + cp -R out $out + ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; inherit outputHash; - PATH = "${git}/bin"; + buildInputs = [git fetch-bower]; } |