089ffc5 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Cabal2Nix/PostProcess.hs: fixed build of X11

commit089ffc5a7510746b7677d7400058ddc3d48637cc authorPeter Simons <simons@cryp.to> dateMon 5 Sep 2011, 20:42 (15 years ago) parent228127f

2 files changed+3−4

unifiedsplit

src/Cabal2Nix/PostProcess.hs+1

@@ -31,5 +31,6 @@ postProcess deriv@(MkDerivation {..})

3131 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }

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

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

34+ | pname == "X11" = deriv { extraLibs = "libXinerama":"libXext":extraLibs }

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

3536 | otherwise = deriv

src/Hackage4Nix.hs+2−4

@@ -150,7 +150,7 @@ genCabal2NixCmdline (Pkg deriv path _) = unwords $ ["cabal2nix"] ++ opts ++ [">"

150150 maints' = [ "--maintainer=" ++ normalizeMaintainer m | m <- maintainers meta ]

151151 plats'

152152 | ["self.ghc.meta.platforms"] == platforms meta = []

153− | otherwise = [ "--platform=" ++ p | p <- platforms meta ]

153+ | otherwise = [ "--platform=" ++ p | p <- platforms meta ]

154154 path'

155155 | path =~ "/[0-9\\.]+\\.nix$" = replaceFileName path (display (version deriv) <.> "nix")

156156 | otherwise = path

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

209209-- should be empty.

210210

211211patchedPackages :: [String]

212−patchedPackages =

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

214− ]

212+patchedPackages = []