about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-12-24 12:31:37 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-21 23:31:05 -0500
commitbf687907d749d79d199d706b4901fbae73bf9e9a (patch)
treeb4d640a4bbb9da9fe2343c7935e59cb7a263771c /pkgs/development/haskell-modules
parentb612597c3d549b50f71f616f2acaa5a1ae0cfa52 (diff)
downloadnixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar.gz
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar.bz2
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar.lz
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar.xz
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.tar.zst
nixlib-bf687907d749d79d199d706b4901fbae73bf9e9a.zip
haskell lib: Make Cabal compiler names explicit
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 21ab10e24a3a..e1b0f78b7151 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -120,7 +120,7 @@ let
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-        cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
       '';
   };