git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #75 from jwiegley/master

Two fixes for packages that are broken on Darwin.

commit5563bc30b24ac0d03736098dd24cff9bb8113ee1 authorPeter Simons <simons@cryp.to> dateMon 11 Aug 2014, 20:17 (12 years ago) parent99bb780b8786af
2 files changed+1−5
compare with master
unifiedsplit
src/Cabal2Nix/Flags.hs+1−4 src/Cabal2Nix/PostProcess.hs−1
src/Cabal2Nix/Flags.hs+1−4
@@ -8,10 +8,7 @@ configureCabalFlags (PackageIdentifier (PackageName name) _)
88 | name == "arithmoi" = [disable "llvm"]
99 | name == "accelerate-examples"= [disable "opencl"]
1010 | name == "folds" = [disable "test-hlint"]
11− | name == "git-annex" = [ enable "S3", enable "WebDAV", enable "Inotify"
12− , enable "Dbus", enable "Assistant", enable "Webapp"
13− , enable "Pairing", enable "XMPP", enable "DNS"
14− , enable "Production", enable "TDFA"]
11+ | name == "git-annex" = [enable "Assistant" , enable "Production"]
1512 | name == "haskeline" = [enable "terminfo"]
1613 | name == "hslua" = [enable "system-lua"]
1714 | name == "idris" = [enable "llvm", enable "gmp", enable "ffi"]
src/Cabal2Nix/PostProcess.hs−1
@@ -47,7 +47,6 @@ postProcess deriv@(MkDerivation {..})
4747 | pname == "haskeline" = deriv { buildDepends = "utf8String":buildDepends }
4848 | pname == "haskell-src" = deriv { buildTools = "happy":buildTools }
4949 | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends }
50− | pname == "hfsevents" = deriv { buildTools = "gccApple":buildTools, phaseOverrides = "configureFlags = \"--ghc-option=-pgmc=${gccApple}/bin/gcc\";" }
5150 | pname == "HFuse" = deriv { phaseOverrides = hfusePreConfigure }
5251 | pname == "highlighting-kate"= highlightingKatePostProcessing deriv
5352 | pname == "hlibgit2" = deriv { testDepends = "git":testDepends }