diff options
author | Robin Gloster <mail@glob.in> | 2017-08-11 11:40:08 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-11 11:40:36 +0200 |
commit | 28cc2642f09419b0a8345d6349329b851d11ad98 (patch) | |
tree | 4b107b35809712540a0962b53dc2f75dfd2fdda0 /pkgs/tools/package-management | |
parent | 72457cdebbeeafbc48cba517f07351ff02cc0dab (diff) | |
download | nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar.gz nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar.bz2 nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar.lz nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar.xz nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.tar.zst nixlib-28cc2642f09419b0a8345d6349329b851d11ad98.zip |
treewide: use less `phases` if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences where this led to duplicating code
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 291b1a7c6002..95280bf60b30 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -8,19 +8,13 @@ let mkPrefetchScript = tool: src: deps: buildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + unpackPhase = ":"; + installPhase = '' - mkdir -p $out/bin - - local wrapArgs="" - cp ${src} $out/bin/$name; - for dep in ${stdenv.lib.concatStringsSep " " deps}; do - wrapArgs="$wrapArgs --prefix PATH : $dep/bin" - done - wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" - wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash - wrapArgs="$wrapArgs --set HOME /homeless-shelter" - wrapProgram $out/bin/$name $wrapArgs + install -vD ${src} $out/bin/$name; + wrapProgram $out/bin/$name \ + --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \ + --set HOME /homeless-shelter ''; preferLocalBuild = true; @@ -32,11 +26,11 @@ let mkPrefetchScript = tool: src: deps: }; }; in rec { - nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar]; - nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; - nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; - nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; - nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; + nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; + nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ]; + nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; |