diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-12-30 22:58:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 22:58:02 -0500 |
| commit | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (patch) | |
| tree | 04068195f42530a34d44a63019ddc9f77654804c /pkgs/applications/science | |
| parent | 553fd19e679b68082329fdae40dcfb40c2f72cba (diff) | |
| parent | a98e68676dc96e9021d9bb0a9f210ac1a35d368b (diff) | |
| download | nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.gz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.bz2 nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.lz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.xz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.zst nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.zip | |
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
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 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf9..64b0f85aed2a 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 4c67904b2b19..9ed535cfe639 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 09a775db9bf5..6951e2a4b61b 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 |