diff options
| author | Peter Simons <simons@cryp.to> | 2017-09-15 18:45:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 18:45:15 +0200 |
| commit | 3510197dccd999ac7189e70d819e0c6a61296817 (patch) | |
| tree | 3d3caf777d88f1d2d77de9398e9ff6f262941f66 /pkgs/os-specific | |
| parent | 666f60bdb016e4ce0a308eb342e41a8585180798 (diff) | |
| download | nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar.gz nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar.bz2 nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar.lz nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar.xz nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.tar.zst nixpkgs-3510197dccd999ac7189e70d819e0c6a61296817.zip | |
Revert "haskell infra, ghc: Slight cleanup"
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/ghc-standalone-archive/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index 227a8c59985..d23328d362e 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -2,7 +2,8 @@ { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; - ghcName = "${ghc.prefix}ghc"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcName = "${crossPrefix}ghc"; in runCommand name { buildInputs = [ with-env cctools ]; } '' mkdir -p $out/lib mkdir -p $out/include |