diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f7a18fa2dac..1324b8b979bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,6 +57,15 @@ self: super: { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + WordNet = pkgs.stdenv.lib.overrideDerivation super.WordNet (drv: { + src = ~/.dev/Haskell/WordNet-1.1.0; + postPatch = (drv.postPatch or "") + '' + substituteInPlace NLP/WordNet/Consts.hs \ + --replace /usr/local/WordNet-2.0 ${pkgs.wordnet} \ + --replace 'defined (MAC)' 0 + ''; + }); + # This package needs a little help compiling properly on Darwin. Furthermore, # Stackage compiles git-annex without the Assistant, supposedly because not # all required dependencies are part of Stackage. To comply with Stackage, we diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 71bdc3e8f829..da93229ce94c 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -54,7 +54,7 @@ rec { if system == "armv7l-linux" then stdenvLinux else if system == "mips64el-linux" then stdenvLinux else if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if system == "x86_64-darwin" then stdenvDarwin else + if system == "x86_64-darwin" then stdenvDarwinPure else if system == "x86_64-solaris" then stdenvNix else if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else