public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pop

Browse Source
This commit is contained in:
Jude Taylor 2015-09-21 15:48:22 -07:00
parent fdf2c3d130
commit 724e243159
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -57,6 +57,15 @@ self: super: {
# Link the proper version. # Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; 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, # This package needs a little help compiling properly on Darwin. Furthermore,
# Stackage compiles git-annex without the Assistant, supposedly because not # Stackage compiles git-annex without the Assistant, supposedly because not
# all required dependencies are part of Stackage. To comply with Stackage, we # all required dependencies are part of Stackage. To comply with Stackage, we

2
pkgs/stdenv/default.nix
View File

@ -54,7 +54,7 @@ rec {
if system == "armv7l-linux" then stdenvLinux else if system == "armv7l-linux" then stdenvLinux else
if system == "mips64el-linux" then stdenvLinux else if system == "mips64el-linux" then stdenvLinux else
if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative 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 == "x86_64-solaris" then stdenvNix else
if system == "i686-cygwin" then stdenvNative else if system == "i686-cygwin" then stdenvNative else
if system == "x86_64-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else