From 6367e48225302ef5932011ec6831f08fa9d67afa Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 28 Sep 2015 09:41:02 -0700 Subject: [PATCH] Revert "pop" This reverts commit 724e243159e4e0059699eb21f6761a760b9a2f49. This (clearly) should never have been committed, and is probably due to a failed stash pop on my part. --- .../development/haskell-modules/configuration-common.nix | 9 --------- pkgs/stdenv/default.nix | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1324b8b979b..9f7a18fa2da 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,15 +57,6 @@ 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 da93229ce94..71bdc3e8f82 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 stdenvDarwinPure else + if system == "x86_64-darwin" then stdenvDarwin else if system == "x86_64-solaris" then stdenvNix else if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else