git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68146 from averelld/rstudio-build-fix
f024caaLinus Heckemann
pkgs/applications/editors/rstudio/default.nix+9−2
@@ -4,6 +4,7 @@
4, llvmPackages
4, llvmPackages
5}:
5}:
6
6
7+with stdenv.lib;
7let
8let
8 verMajor = "1";
9 verMajor = "1";
9 verMinor = "2";
10 verMinor = "2";
@@ -47,7 +48,13 @@ stdenv.mkDerivation rec {
47 sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
48 sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
48 };
49 };
49
50
50− hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts));
51+ hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts));
52+ # These dicts contain identically-named dict files, so we only keep the
53+ # -large versions in case of clashes
54+ largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;
55+ otherDicts = filter (d: !(hasAttr "dictFileName" d &&
56+ elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries;
57+ dictionaries = largeDicts ++ otherDicts;
51
58
52 mathJaxSrc = fetchurl {
59 mathJaxSrc = fetchurl {
53 url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
60 url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
@@ -77,7 +84,7 @@ stdenv.mkDerivation rec {
77 mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
84 mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
78
85
79 mkdir dependencies/common/dictionaries
86 mkdir dependencies/common/dictionaries
80− for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
87+ for dict in ${builtins.concatStringsSep " " dictionaries}; do
81 for i in "$dict/share/hunspell/"*; do
88 for i in "$dict/share/hunspell/"*; do
82 ln -sv $i dependencies/common/dictionaries/
89 ln -sv $i dependencies/common/dictionaries/
83 done
90 done