git.iko.soy/typeable/cabal2nix
on master help sign in
Build highlighting-kate with 'pcre-light' enabled.
commitae2653a50ce1f674ad254f04874cb63b77a255f3 authorPeter Simons <simons@cryp.to> dateWed 25 Feb 2015, 20:38 (12 years ago) parent455f162
2 files changed+1−7
compare with master
unifiedsplit
src/Cabal2Nix/Flags.hs+1 src/Cabal2Nix/PostProcess.hs−7
src/Cabal2Nix/Flags.hs+1
@@ -13,6 +13,7 @@ configureCabalFlags (PackageIdentifier (PackageName name) _)
1313 | name == "git-annex" = [enable "Assistant" , enable "Production"]
1414 | name == "haskeline" = [enable "terminfo"]
1515 | name == "haste-compiler" = [enable "portable"]
16+ | name == "highlighting-kate" = [enable "pcre-light"]
1617 | name == "hslua" = [enable "system-lua"]
1718 | name == "hxt" = [enable "network-uri"]
1819 | name == "idris" = [enable "gmp", enable "ffi"]
src/Cabal2Nix/PostProcess.hs−7
@@ -58,7 +58,6 @@ postProcess' deriv@(MkDerivation {..})
5858 | pname == "haskell-src" = deriv { buildTools = Set.insert "happy" buildTools }
5959 | pname == "haskell-src-meta" = deriv { buildDepends = Set.insert "uniplate" buildDepends }
6060 | pname == "HFuse" = deriv { phaseOverrides = hfusePreConfigure }
61− | pname == "highlighting-kate"= highlightingKatePostProcessing deriv
6261 | pname == "hlibgit2" = deriv { buildTools = Set.insert "git" buildTools }
6362 | pname == "HList" = deriv { buildTools = Set.insert "diffutils" buildTools }
6463 | pname == "hmatrix" = deriv { extraLibs = Set.insert "liblapack" (Set.insert "blas" (Set.filter (/= "lapack") extraLibs)) }
@@ -160,12 +159,6 @@ darcsInstallPostInstall = unlines
160159 , "'';"
161160 ]
162161
163−highlightingKatePostProcessing :: Derivation -> Derivation
164−highlightingKatePostProcessing deriv@(MkDerivation {..}) = deriv
165− { phaseOverrides = "prePatch = \"sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal\";"
166− , buildDepends = Set.insert "regex-pcre" (Set.delete "regex-pcre-builtin" buildDepends)
167− }
168−
169162xmonadPostInstall :: String
170163xmonadPostInstall = unlines
171164 [ "postInstall = ''"