git.iko.soy/typeable/cabal2nix
on master help sign in
xmonad: update post-process hook that installs the man page for 0.14.2 and later
commita77f6a79a574b61ebc631634264ac179361bf200 authorPeter Simons <simons@cryp.to> dateTue 21 Aug 2018, 10:35 (8 years ago) parent84957b7
1 file changed+3−5
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+3−5
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+3−5
@@ -170,7 +170,7 @@ hooks =
170170 , ("wxc", wxcHook)
171171 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
172172 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
173− , ("xmonad", set phaseOverrides xmonadPostInstall)
173+ , ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)
174174 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))
175175 , ("zip-archive >= 0.3.1 && < 0.3.2.3", over (testDepends . tool) (Set.union (Set.fromList [pkg "zip", pkg "unzip"]))) -- https://github.com/jgm/zip-archive/issues/35
176176 ]
@@ -281,10 +281,8 @@ darcsInstallPostInstall = unlines
281281xmonadPostInstall :: String
282282xmonadPostInstall = unlines
283283 [ "postInstall = ''"
284− , " shopt -s globstar"
285− , " mkdir -p $doc/share/man/man1"
286− , " mv \"$data/\"**\"/man/\"*[0-9] $doc/share/man/man1/"
287− , " rm \"$data/\"**\"/man/\"*"
284+ , " install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"
285+ , " install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"
288286 , "'';"
289287 ]
290288