From 6bd48cbfef266b2ff8f1930a3b83693a3340cdb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 15:51:39 +0100 Subject: [PATCH] Enable Darwin builds of Haskell packages again. Hopefully, issues like https://github.com/NixOS/nixpkgs/issues/2689 are all remedied by now. --- pkgs/development/compilers/ghc/7.8.4.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index c4000fc86c2..5497b35ec1d 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -38,15 +38,11 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - meta = with stdenv.lib; { + meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; - inherit (ghc.meta) license; - # Filter old "i686-darwin" platform which is unsupported these days. - platforms = filter (x: elem x platforms.all) ghc.meta.platforms; - # Disable Darwin builds: . - hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; }; }