git.iko.soy/typeable/cabal2nix
on master help sign in
Add undeclared dependencies to 'alex' in post-processing.
f1bbc76Peter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+3−1
compare with master
unifiedsplit
@@ -34,7 +34,9 @@ fixGtkBuilds drv = drv & dependencies . pkgconfig %~ Set.filter (not . collidesW
34
34
35hooks :: [(Dependency, Derivation -> Derivation)]
35hooks :: [(Dependency, Derivation -> Derivation)]
36hooks =
36hooks =
37+ [ ("alex", set (executableDepends . tool . contains (bind "self.happy")) True)
38+ , ("alex < 3.1.5", set (testDepends . tool . contains (pkg "perl")) True)
37− [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
39+ , ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
38 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
40 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
39 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
41 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
40 , ("darcs", set phaseOverrides darcsInstallPostInstall)
42 , ("darcs", set phaseOverrides darcsInstallPostInstall)