228127f · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

The xmonad-extras build doesn't succeed with hlist support is enabled.

commit228127f45f08fae5e2b1d3e33598a7893a30bc27 authorPeter Simons <simons@cryp.to> dateMon 5 Sep 2011, 20:25 (15 years ago) parent69dd2f0

3 files changed+7−11

unifiedsplit

src/Cabal2Nix/Flags.hs+7−8

@@ -5,15 +5,14 @@ import Distribution.PackageDescription

66pkgConfigureFlags :: PackageIdentifier -> (FlagAssignment,[String])

77pkgConfigureFlags (PackageIdentifier (PackageName name) _)

8− | name == "pandoc" = ([enable "highlighting", enable "threaded"],[])

9− | name == "threadscope" = ([], ["--ghc-options=-rtsopts"])

10− | name == "X11-xft" = ([], ["--extra-include-dirs=${freetype}/include/freetype2"])

11− | otherwise = ([],[])

8+ | name == "pandoc" = ([enable "highlighting", enable "threaded"],[])

9+ | name == "threadscope" = ([], ["--ghc-options=-rtsopts"])

10+ | name == "X11-xft" = ([], ["--extra-include-dirs=${freetype}/include/freetype2"])

11+ | name == "xmonad-extras" = ([disable "with_hlist", disable "with_mpd"], [])

12+ | otherwise = ([],[])

1213

1314enable :: String -> (FlagName,Bool)

1415enable name = (FlagName name, True)

1516

16−-- Uncommend this function when it's actually used.

17−--

18−-- disable :: String -> (FlagName,Bool)

19−-- disable name = (FlagName name, False)

17+disable :: String -> (FlagName,Bool)

18+disable name = (FlagName name, False)

src/Cabal2Nix/PostProcess.hs−2

@@ -32,6 +32,4 @@ postProcess deriv@(MkDerivation {..})

3232 | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs }

3333 | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }

3434 | pname == "X11-xft" = deriv { extraLibs = "pkgconfig":"freetype":"fontconfig":extraLibs }

35− | pname == "xmonad" = deriv { extraLibs = delete "libmpd" extraLibs }

36− | pname == "xmonad-extras" = deriv { buildDepends = delete "libmpd" buildDepends }

3735 | otherwise = deriv

src/Hackage4Nix.hs−1

@@ -211,5 +211,4 @@ badPackagePaths = ["haskell-platform/2011.2.0.1.nix"]

211211patchedPackages :: [String]

212212patchedPackages =

213213 [ "X11" -- expression uses function arguments to determine feature set

214− , "xmonad-extras" -- the generated expression doesn't build, don't know why

215214 ]