git.iko.soy/typeable/cabal2nix
on master help sign in
Don't wrap raw Yi at all
e7088a7Mateusz Kowalczyk
src/Cabal2Nix/PostProcess.hs+1−9
@@ -118,7 +118,7 @@ postProcess deriv@(MkDerivation {..})
118 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
118 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
119 }
119 }
120 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
120 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
121− | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiPhases, buildTools = "makeWrapper":buildTools }
121+ | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiFixHaddock }
122 | otherwise = deriv
122 | otherwise = deriv
123
123
124cudaConfigurePhase :: String
124cudaConfigurePhase :: String
@@ -210,14 +210,6 @@ xmonadPostInstall = unlines
210yiFixHaddock :: String
210yiFixHaddock :: String
211yiFixHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.8\";"
211yiFixHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.8\";"
212
212
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−
221gitAnnexOverrides :: String
213gitAnnexOverrides :: String
222gitAnnexOverrides = unlines
214gitAnnexOverrides = unlines
223 [ "preConfigure = \"export HOME=$TEMPDIR\";"
215 [ "preConfigure = \"export HOME=$TEMPDIR\";"