git.iko.soy/typeable/cabal2nix
on master help sign in
PostProcess.hs: clean up
da761b0Peter Simons
src/Cabal2Nix/PostProcess.hs−7
compare with master
unifiedsplit
@@ -65,7 +65,6 @@ postProcess deriv@(MkDerivation {..})
65 | pname == "llvm-general-pure"= deriv { doCheck = False }
65 | pname == "llvm-general-pure"= deriv { doCheck = False }
66 | pname == "MFlow" = deriv { buildTools = "cpphs":buildTools }
66 | pname == "MFlow" = deriv { buildTools = "cpphs":buildTools }
67 | pname == "multiarg" = deriv { buildDepends = "utf8-string":buildDepends }
67 | pname == "multiarg" = deriv { buildDepends = "utf8-string":buildDepends }
68− | pname == "mime-mail" = deriv { extraFunctionArgs = ["sendmail ? \"sendmail\""], phaseOverrides = mimeMailConfigureFlags }
69 | pname == "mysql" = deriv { buildTools = "mysqlConfig":buildTools, extraLibs = "zlib":extraLibs }
68 | pname == "mysql" = deriv { buildTools = "mysqlConfig":buildTools, extraLibs = "zlib":extraLibs }
70 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
69 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
71 | pname == "Omega" = deriv { testDepends = delete "stdc++" testDepends }
70 | pname == "Omega" = deriv { testDepends = delete "stdc++" testDepends }
@@ -86,7 +85,6 @@ postProcess deriv@(MkDerivation {..})
86 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
85 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
87 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
86 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
88 | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
87 | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
89− | pname == "tz" = deriv { extraFunctionArgs = ["tzdata"], phaseOverrides = "preConfigure = \"export TZDIR=${tzdata}/share/zoneinfo\";" }
90 | pname == "vacuum" = deriv { extraLibs = "ghc-paths":extraLibs }
88 | pname == "vacuum" = deriv { extraLibs = "ghc-paths":extraLibs }
91 | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall version }
89 | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall version }
92 | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }
90 | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }
@@ -222,11 +220,6 @@ sloanePostInstall = unlines
222 , "'';"
220 , "'';"
223 ]
221 ]
224
222
225−mimeMailConfigureFlags :: String
226−mimeMailConfigureFlags = unlines
227− [ "configureFlags = \"--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\\\"${sendmail}\\\"\";"
228− ]
229−
230haddockPreCheck :: String
223haddockPreCheck :: String
231haddockPreCheck = "preCheck = \"unset GHC_PACKAGE_PATH\";"
224haddockPreCheck = "preCheck = \"unset GHC_PACKAGE_PATH\";"
232
225