diff options
| author | Peter Simons <simons@cryp.to> | 2014-05-05 00:32:45 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-05-05 00:33:51 +0200 |
| commit | f31f57c32dc9fb2cf97d16181a161a47b9004d70 (patch) | |
| tree | ce6f747496d10ce16f7aba7a917046e7ede45df3 /pkgs/development/r-modules/generic-builder.nix | |
| parent | 66bcd77f0ebdacb99ad54339945fb9a082f20df6 (diff) | |
| download | nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar.gz nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar.bz2 nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar.lz nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar.xz nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.tar.zst nixlib-f31f57c32dc9fb2cf97d16181a161a47b9004d70.zip | |
r-generic-builder: don't let derivation override the naming scheme
Diffstat (limited to 'pkgs/development/r-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index e1b3a6cc1a80..1899eaa61d46 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -3,8 +3,6 @@ R: { name, buildInputs ? [], ... } @ attrs: R.stdenv.mkDerivation ({ - name = "r-" + name; - buildInputs = buildInputs ++ [R]; configurePhase = '' @@ -30,4 +28,6 @@ R.stdenv.mkDerivation ({ ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi ''; -} // attrs) +} // attrs // { + name = "r-" + name; +}) |