git.iko.soy/typeable/cabal2nix
on master help sign in
Don't hardcode $doc.

Split outputs can be disabled, in which case $doc is the empty string. `outputDoc` always points to the right output variable name (either "out" or "doc"). See also https://github.com/NixOS/nixpkgs/pull/61526.

commite6dcdda06d30f13eb0cc305e5a66363c527f1b44 authorNiklas Hambüchen <mail@nh2.me> dateWed 15 May 2019, 22:30 (7 years ago) parent03a70e6
1 file changed+2−2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
@@ -291,8 +291,8 @@ darcsInstallPostInstall = unlines
291291xmonadPostInstall :: String
292292xmonadPostInstall = unlines
293293 [ "postInstall = ''"
294− , " install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"
295− , " install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"
294+ , " install -D man/xmonad.1 ${!outputDoc}/share/man/man1/xmonad.1"
295+ , " install -D man/xmonad.hs ${!outputDoc}/share/doc/$name/sample-xmonad.hs"
296296 , "'';"
297297 ]
298298