diff options
| author | Peter Simons <simons@cryp.to> | 2015-04-23 15:21:15 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-05-04 12:27:03 +0200 |
| commit | 436fbf8564077ca84c2c8aaf8f538d1b425f42b7 (patch) | |
| tree | c296703e94c5d4b1c24c479a7a617353943822e7 /pkgs/development/compilers/uhc | |
| parent | a1865004172bace7342d1d3b0f76392dc29d5075 (diff) | |
| download | nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar.gz nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar.bz2 nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar.lz nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar.xz nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.tar.zst nixlib-436fbf8564077ca84c2c8aaf8f538d1b425f42b7.zip | |
uhc: convert build to Haskell NG
Diffstat (limited to 'pkgs/development/compilers/uhc')
| -rw-r--r-- | pkgs/development/compilers/uhc/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index d2b9ec63a73d..6096fc4e4c4a 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -1,9 +1,6 @@ -{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, - shuffle, - hashable, mtl, network, uhc-util, uulib -}: +{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }: -let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); +let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { version = "1.1.8.10"; name = "uhc-${version}"; @@ -16,7 +13,7 @@ in stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/EHC"; - buildInputs = [ m4 wrappedGhc clang libtool shuffle ]; + buildInputs = [ m4 wrappedGhc clang libtool ]; configureFlags = [ "--with-gcc=${clang}/bin/clang" ]; |