diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-01-19T19·34+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-01-19T19·34+0000 |
| commit | 1f68644dc93fcc9a0784de7f3db73186524e0f43 (patch) | |
| tree | b72182f8bc9b86376b49272814cd8cdf493eea65 /third_party | |
| parent | 0a3613996fb543327fbca3f8f47fc4589192d557 (diff) | |
feat(third_party/guile): Override guile to version 3.0.0 r/423
Lets try this thing out!
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/default.nix | 2 | ||||
| -rw-r--r-- | third_party/guile/default.nix | 12 | ||||
| -rw-r--r-- | third_party/guile/setup-hook-3.0.sh | 13 |
3 files changed, 26 insertions, 1 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 410e1b03de..1df13abd2e 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -108,7 +108,7 @@ in exposed // { # Packages to be overridden originals = { - inherit (nixpkgs) git notmuch; + inherit (nixpkgs) git guile notmuch; }; # Make NixOS available diff --git a/third_party/guile/default.nix b/third_party/guile/default.nix new file mode 100644 index 0000000000..7a54a7cd92 --- /dev/null +++ b/third_party/guile/default.nix @@ -0,0 +1,12 @@ +# Override Guile to version 3.0.0 +{ pkgs, ... }: + +pkgs.third_party.originals.guile.overrideAttrs(old: rec { + name = "guile-${version}"; + version = "3.0.0"; + + src = pkgs.third_party.fetchurl { + url = "mirror://gnu/guile/${name}.tar.xz"; + sha256 = "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9"; + }; +}) diff --git a/third_party/guile/setup-hook-3.0.sh b/third_party/guile/setup-hook-3.0.sh new file mode 100644 index 0000000000..61d0af988c --- /dev/null +++ b/third_party/guile/setup-hook-3.0.sh @@ -0,0 +1,13 @@ +addGuileLibPath () { + if test -d "$1/share/guile/site/3.0" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0" + elif test -d "$1/share/guile/site" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" + fi +} + +addEnvHooks "$hostOffset" addGuileLibPath |