diff options
| author | 3noch <eacameron@gmail.com> | 2017-02-25 17:45:40 -0500 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2017-03-02 11:35:11 -0500 |
| commit | 4b77d425aa5970f39f0637894075d2df8c1575c8 (patch) | |
| tree | 72d7427bac79601f92d16a1ca04dff262d4e6e47 /pkgs/development/compilers/ghcjs | |
| parent | 7d356ff69646e78c5f9a362ff8b5912fa9ecec7c (diff) | |
| download | nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.gz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.bz2 nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.lz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.xz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.zst nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.zip | |
Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS
Original: https://github.com/NixOS/nixpkgs-channels/commit/f3110651c81cc3fd4f6d342f0c30d363ea8cd0b0 (With some tweaks from @cstrahan) closes #23199
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 5ffc6e2720e0..ac9419d662ec 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -1,4 +1,5 @@ { mkDerivation +, lib , broken ? false , test-framework , test-framework-hunit @@ -94,6 +95,11 @@ ] , stage2 ? import ./stage2.nix + +, patches ? [ ./ghcjs.patch ] + +# used for resolving compiler plugins +, ghcLibdir ? null }: let inherit (bootPkgs) ghc; @@ -122,7 +128,7 @@ in mkDerivation (rec { testDepends = [ HUnit test-framework test-framework-hunit ]; - patches = [ ./ghcjs.patch ]; + inherit patches; postPatch = '' substituteInPlace Setup.hs \ --replace "/usr/bin/env" "${coreutils}/bin/env" @@ -165,6 +171,8 @@ in mkDerivation (rec { --with-cabal ${cabal-install}/bin/cabal \ --with-gmp-includes ${gmp.dev}/include \ --with-gmp-libraries ${gmp.out}/lib + '' + lib.optionalString (ghcLibdir != null) '' + printf '%s' '${ghcLibdir}' > "$out/lib/ghcjs-${version}/ghc_libdir" ''; passthru = { inherit bootPkgs; |