99ba591 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

on master help sign in

Fix post-process hook for wxc to generate a self-contained build expression.

99ba591Peter Simons11 years ago

src/Cabal2Nix/PostProcess.hs+5−4

@@ -72,14 +72,15 @@ gfPhaseOverrides = unlines

72 ]

74wxcHook :: Derivation -> Derivation

75−wxcHook drv = drv & libraryDepends . system %~ Set.union (Set.fromList [dep "wxGTK", dep "mesa", dep "libX11"])

75+wxcHook drv = drv & libraryDepends . system %~ Set.union (Set.fromList [dep "mesa", dep "libX11"])

76+ & libraryDepends . pkgconfig . contains (dep "wxGTK") .~ True

76 & phaseOverrides .~ wxcPostInstall (packageVersion drv)

77 & phaseOverrides .~ wxcPostInstall (packageVersion drv)

78+ & runHaddock .~ False

77 where

79 where

78 wxcPostInstall :: Version -> String

80 wxcPostInstall :: Version -> String

79 wxcPostInstall version = unlines

81 wxcPostInstall version = unlines

80− [ "postInstall = ''"

81− , " cp -v dist/build/libwxc.so." ++ display version ++ " $out/lib/libwxc.so"

82+ [ "postInstall = \"cp -v dist/build/libwxc.so." ++ display version ++ " $out/lib/libwxc.so\";"

82− , "'';"

83+ , "postPatch = \"sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs\";"

83 ]

84 ]

85cabalInstallPostInstall :: String

86cabalInstallPostInstall :: String