ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

rstudio: make mkDerivation recursive

Browse Source 
Needed since we want to access desktopItem from postInstall.
This commit is contained in:
Laverne Schrock 2016-11-21 18:06:28 -06:00
parent 4154adb128
commit 9872e65037
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/applications/editors/rstudio/default.nix
View File

@ -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