summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/make-package-set.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-10-15 11:22:19 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-10-15 11:23:33 -0400
commit66a9f39817c2054ad18d78063ae9a9d50d1f1ee3 (patch)
tree0138dfe3197146f46e5f72ceb30baa9461ef181c /pkgs/development/haskell-modules/make-package-set.nix
parentc9ff78150b1119da3445629fa28647744a221bd4 (diff)
downloadnixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar.gz
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar.bz2
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar.lz
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar.xz
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.tar.zst
nixpkgs-66a9f39817c2054ad18d78063ae9a9d50d1f1ee3.zip
haskellSrc2nix
Since [1], cabal2nix has been able to parse full platform triples. We
need this for when the system doesn't say enough info (e.g. android).

[1]: https://github.com/NixOS/cabal2nix/commit/0bb88f0009710e013564f24c195fd037e766310e#diff-d9172aeec4039eef8cfcc8a2ab6c0677R143
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-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 cd9a101d3c5..ba477e06e2f 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -133,7 +133,7 @@ let
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-        cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
+        cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
       '';
   };