public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use less phases if not necessary

Browse Source 
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
This commit is contained in:
Robin Gloster
2017-08-11 11:40:36 +02:00
parent 72457cdebb
commit 28cc2642f0
16 changed files with 43 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+11 -17
View File
@@ -8,19 +8,13 @@ let mkPrefetchScript = tool: src: deps:
buildInputs = [ makeWrapper ];
phases = [ "installPhase" "fixupPhase" ];
installPhase = ''
mkdir -p $out/bin
unpackPhase = ":";
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
installPhase = ''
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";