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

r-generic-builder: don't let derivation override the naming scheme

Browse Source
This commit is contained in:
Peter Simons 2014-05-05 00:32:45 +02:00
parent 66bcd77f0e
commit f31f57c32d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/r-modules/generic-builder.nix
View File

@ -3,8 +3,6 @@ R:
{ name, buildInputs ? [], ... } @ attrs: { name, buildInputs ? [], ... } @ attrs:
R.stdenv.mkDerivation ({ R.stdenv.mkDerivation ({
name = "r-" + name;
buildInputs = buildInputs ++ [R]; buildInputs = buildInputs ++ [R];
configurePhase = '' configurePhase = ''
@ -30,4 +28,6 @@ R.stdenv.mkDerivation ({
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
fi fi
''; '';
} // attrs) } // attrs // {
name = "r-" + name;
})