git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #100 from Fuuzetsu/yi
a264d3cPeter Simons
src/Cabal2Nix/Flags.hs+1−1
compare with master
unifiedsplit
@@ -19,7 +19,7 @@ configureCabalFlags (PackageIdentifier (PackageName name) _)
19 | name == "snap-server" = [enable "openssl"]
19 | name == "snap-server" = [enable "openssl"]
20 | name == "xmobar" = [enable "all_extensions"]
20 | name == "xmobar" = [enable "all_extensions"]
21 | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]
21 | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]
22− | name == "yi" = [enable "pango"]
22+ | name == "yi" = [enable "pango", enable "vty"]
23 | otherwise = []
23 | otherwise = []
24
24
25enable :: String -> (FlagName,Bool)
25enable :: String -> (FlagName,Bool)
src/Cabal2Nix/PostProcess.hs+12
@@ -117,6 +117,7 @@ postProcess deriv@(MkDerivation {..})
117 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
117 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
118 }
118 }
119 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
119 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
120+ | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiPhases, buildTools = "makeWrapper":buildTools }
120 | otherwise = deriv
121 | otherwise = deriv
121
122
122cudaConfigurePhase :: String
123cudaConfigurePhase :: String
@@ -205,6 +206,17 @@ xmonadPostInstall = unlines
205 , "];"
206 , "];"
206 ]
207 ]
207
208
209+yiFixHaddock :: String
210+yiFixHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.8\";"
211+
212+yiPhases :: String
213+yiPhases = unlines
214+ [ yiFixHaddock
215+ , "postInstall = ''"
216+ , " wrapProgram $out/bin/yi --suffix GHC_PACKAGE_PATH : $out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:$GHC_PACKAGE_PATH"
217+ , "'';"
218+ ]
219+
208gitAnnexOverrides :: String
220gitAnnexOverrides :: String
209gitAnnexOverrides = unlines
221gitAnnexOverrides = unlines
210 [ "preConfigure = \"export HOME=$TEMPDIR\";"
222 [ "preConfigure = \"export HOME=$TEMPDIR\";"