diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix index 08ac509a2456..091b81b16416 100644 --- a/pkgs/development/compilers/jhc/default.nix +++ b/pkgs/development/compilers/jhc/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl, - regexCompat, HsSyck, random }: +{ stdenv, fetchurl, perl, ghcWithPackages }: + +let ghc = ghcWithPackages (hpkgs: with hpkgs; [ + binary zlib utf8-string readline fgl regex-compat HsSyck random + ]); +in stdenv.mkDerivation rec { name = "jhc-${version}"; @@ -10,10 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz"; }; - buildInputs = - [ perl ghc binary zlib utf8String - readline fgl regexCompat HsSyck random - ]; + buildInputs = [ perl ghc ]; meta = { description = "Whole-program, globally optimizing Haskell compiler"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00b791225f85..d1b0dba83d20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3744,8 +3744,7 @@ let }; jhc = callPackage ../development/compilers/jhc { - inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl - regexCompat HsSyck random; + inherit (haskell.packages.ghc763) ghcWithPackages; }; uhc = callPackage ../development/compilers/uhc/default.nix ({