diff options
| author | Peter Simons <simons@cryp.to> | 2014-05-04 22:24:57 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-05-04 22:24:57 +0200 |
| commit | 4e1e248cf1dc0f90d7853d8dd716372a88dd7d85 (patch) | |
| tree | 9dafc2b94a9b28c3f794dec6ec6a1290f2225e1e /pkgs/development/r-modules | |
| parent | ef05fad51ab36c0064d542d8665ae27faab2e9d3 (diff) | |
| download | nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar.gz nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar.bz2 nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar.lz nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar.xz nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.tar.zst nixlib-4e1e248cf1dc0f90d7853d8dd716372a88dd7d85.zip | |
r-generic-builder: clean up the expression
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/generic/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/development/r-modules/generic/default.nix b/pkgs/development/r-modules/generic/default.nix index d405cc018d15..1e6977430d9f 100644 --- a/pkgs/development/r-modules/generic/default.nix +++ b/pkgs/development/r-modules/generic/default.nix @@ -1,17 +1,9 @@ R: -{ buildInputs ? [], ... } @ attrs: +{ name, buildInputs ? [], ... } @ attrs: -R.stdenv.mkDerivation ( - { - } - // - attrs - // - { - name = "r-" + attrs.name; - builder = ./builder.sh; - buildInputs = buildInputs ++ [ R ]; - phases = [ "installPhase" "fixupPhase" ]; - } -) +R.stdenv.mkDerivation (attrs // { + name = "r-" + name; + builder = ./builder.sh; + buildInputs = buildInputs ++ [ R ]; +}) |