diff options
| author | Laverne Schrock <laverne@schrock.email> | 2016-11-21 18:06:28 -0600 |
|---|---|---|
| committer | Laverne Schrock <laverne@schrock.email> | 2016-12-22 08:16:49 -0600 |
| commit | 9872e65037f03fa45e463dae5c23c35e53e245f4 (patch) | |
| tree | 5090f1c5c8dc5c0c17104f0a6cfaf0cdcda8dfca /pkgs/applications/editors/rstudio | |
| parent | 4154adb128c5bc1e7c44fa4a38230f1d6d110b0e (diff) | |
rstudio: make mkDerivation recursive
Needed since we want to access desktopItem from postInstall.
Diffstat (limited to 'pkgs/applications/editors/rstudio')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 244b3b67045b..82bcc485da3c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -5,7 +5,7 @@ let ginVer = "1.5"; gwtVer = "2.5.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "RStudio-${version}"; buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; }; - hunspellDicts = builtins.attrValues hunspellDicts; + hunspellDictionaries = builtins.attrValues hunspellDicts; mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; @@ -50,7 +50,7 @@ stdenv.mkDerivation { mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer mkdir dependencies/common/dictionaries - for dict in $hunspellDicts; do + for dict in $hunspellDictionaries; do for i in "$dict/share/hunspell/"* do ln -sv $i dependencies/common/dictionaries/ done |