git.iko.soy/typeable/cabal2nix
on master help sign in
zip-archive: manually add zip and unzip to the build environment
d70aef8Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
compare with master
unifiedsplit
@@ -130,7 +130,7 @@ hooks =
130 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
130 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
131 , ("xmonad", set phaseOverrides xmonadPostInstall)
131 , ("xmonad", set phaseOverrides xmonadPostInstall)
132 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (bind "self.zip") (pkg "zip")))
132 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (bind "self.zip") (pkg "zip")))
133− , ("zip-archive >= 0.3.1", set (testDepends . tool . contains (pkg "zip")) True) -- https://github.com/jgm/zip-archive/issues/35
133+ , ("zip-archive >= 0.3.1", over (testDepends . tool) (Set.union (Set.fromList [pkg "zip", pkg "unzip"]))) -- https://github.com/jgm/zip-archive/issues/35
134 ]
134 ]
135
135
136pkg :: Identifier -> Binding
136pkg :: Identifier -> Binding