git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #101 from Fuuzetsu/yi

Don't wrap raw Yi at all

commit7f1a5dc087aecc0d78bbc234dbc690c19fd534d3 authorPeter Simons <simons@cryp.to> dateSat 18 Oct 2014, 17:57 (12 years ago) parentbc0da04e7088a7
1 file changed+1−9
src/Cabal2Nix/PostProcess.hs+1−9
src/Cabal2Nix/PostProcess.hs+1−9
@@ -118,7 +118,7 @@ postProcess deriv@(MkDerivation {..})
118118 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
119119 }
120120 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
121− | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiPhases, buildTools = "makeWrapper":buildTools }
121+ | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiFixHaddock }
122122 | otherwise = deriv
123123
124124cudaConfigurePhase :: String
@@ -210,14 +210,6 @@ xmonadPostInstall = unlines
210210yiFixHaddock :: String
211211yiFixHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.8\";"
212212
213−yiPhases :: String
214−yiPhases = unlines
215− [ yiFixHaddock
216− , "postInstall = ''"
217− , " wrapProgram $out/bin/yi --suffix GHC_PACKAGE_PATH : $out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:$GHC_PACKAGE_PATH"
218− , "'';"
219− ]
220−
221213gitAnnexOverrides :: String
222214gitAnnexOverrides = unlines
223215 [ "preConfigure = \"export HOME=$TEMPDIR\";"