diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-24 16:57:05 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-24 16:57:05 -0500 |
| commit | d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b (patch) | |
| tree | b7a5297ef2c93445cbc21ab9ac26897ebe7f9f2b /pkgs | |
| parent | bd9f128cc2a150a53ff3b63eba485f940d02d61a (diff) | |
| parent | 55720db388a2c2cf767c2770db7cb6da2806678c (diff) | |
| download | nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar.gz nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar.bz2 nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar.lz nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar.xz nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.tar.zst nixlib-d2e0b6cf6f13691e95b94c2ef0c777c6dde1da6b.zip | |
Merge pull request #13433 from ryantrinkle/ghcjs-boot-overridable
ghcjs: Make ghcjs-boot source code overridable
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/ghcjs-boot.nix | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 722c3eab10ae..808768f74b86 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -38,7 +38,16 @@ , coreutils , libiconv -, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit runCommand; } +, ghcjsBootSrc ? fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f"; + sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j"; + fetchSubmodules = true; + } +, ghcjsBoot ? import ./ghcjs-boot.nix { + inherit runCommand; + src = ghcjsBootSrc; + } , shims ? import ./shims.nix { inherit fetchFromGitHub; } }: let diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix index add39a35242b..c00e13a92404 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix @@ -1,14 +1,4 @@ -{ runCommand, fetchgit }: - -let - src = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f"; - sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j"; - fetchSubmodules = true; - }; - -in +{ runCommand, src }: # we remove the patches so ghcjs-boot doesn't try to apply them again. runCommand "${src.name}-patched" {} '' |