diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-02 19:10:45 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-02 19:10:45 +0100 |
commit | 804285f589ded484b530750dd1ec03b9052bcdac (patch) | |
tree | 8b20955e293215e1b8d672a3fd38867c39484609 /pkgs/applications/science | |
parent | 63c1a54257a5cef15b926c0843b3c7557c6f9a24 (diff) | |
parent | 4cc2a38854338ba783fb867ff924200b59867773 (diff) | |
download | nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar.gz nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar.bz2 nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar.lz nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar.xz nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.tar.zst nixpkgs-804285f589ded484b530750dd1ec03b9052bcdac.zip |
Merge remote-tracking branch 'upstream/staging' into HEAD
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/coq/8.4.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/R/setup-hook.sh | 6 | ||||
-rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf..64b0f85aed2 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; passthru = { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 4c67904b2b1..9ed535cfe63 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -110,7 +110,7 @@ self = stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; preConfigure = '' diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 09a775db9bf..6951e2a4b61 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -1,5 +1,7 @@ addRLibPath () { - addToSearchPath R_LIBS_SITE $1/library + if [[ -d "$1/library" ]]; then + addToSearchPath R_LIBS_SITE "$1/library" + fi } -envHooks+=(addRLibPath) +addEnvHooks "$targetOffset" addRLibPath diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 3e4c8c70286..67dcfd8dc1d 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.lib mpfr gmp + buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl |