diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-10 15:36:48 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 21:00:13 -0500 |
commit | a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d (patch) | |
tree | 987af15595383dcc62bfb3dd5e3b8b1cb2b39cd4 /pkgs/os-specific/darwin | |
parent | a5cc983c45fc8b2d0f6b7aa70f0f1911d35c1a13 (diff) | |
download | nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar.gz nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar.bz2 nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar.lz nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar.xz nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.tar.zst nixlib-a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d.zip |
haskell infra: Fix cross as much as possible without changing hashes
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r-- | pkgs/os-specific/darwin/ghc-standalone-archive/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index d23328d362e0..46ba68281868 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -2,8 +2,7 @@ { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcName = "${crossPrefix}ghc"; + ghcName = "${ghc.targetPrefix}ghc"; in runCommand name { buildInputs = [ with-env cctools ]; } '' mkdir -p $out/lib mkdir -p $out/include |