diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:51:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:52:45 +0200 |
| commit | 06fea81c6e3d71689b59df6e2bbc11fe01ce9056 (patch) | |
| tree | 5849b904bf1eb3bc8cb28b29729d83a4d0337542 /pkgs/build-support | |
| parent | 20be024d1bae622409fa56844b2f8799bbf29bb0 (diff) | |
| parent | 0c398f60405090743fbdcf14faf1193c642b6328 (diff) | |
| download | nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.gz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.bz2 nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.lz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.xz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.zst nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.zip | |
Merge recent master into staging
Hydra: ?compare=1150594
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a17daf9a2c57..c52a26b7165d 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,5 +1,7 @@ {stdenv, git, cacert}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true +, name ? "git-export" +}: /* NOTE: fetchgit has one problem: git fetch only works for refs. @@ -26,7 +28,7 @@ assert md5 != "" || sha256 != ""; stdenv.mkDerivation { - name = "git-export"; + inherit name; builder = ./builder.sh; fetcher = ./nix-prefetch-git; buildInputs = [git]; diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index dd43068be279..41f2a59246d1 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -96,10 +96,7 @@ filterExisting() { # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...> wrapProgram() { local prog="$1" - local progBasename=$(basename $prog) - local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin" - mkdir -p $hiddenDir - local hidden="$(cd "$hiddenDir"; pwd)/$progBasename" + local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped mv $prog $hidden makeWrapper $hidden $prog "$@" } |