git.iko.soy/typeable/cabal2nix
on master help sign in
haskell-eventstore does not compile on 32 bit platforms.
9cb4702Peter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+6−3
compare with master
unifiedsplit
@@ -2,17 +2,19 @@
2
2
3module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess ) where
3module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess ) where
4
4
5+import Control.Lens
5import Control.Lens.Create
6import Control.Lens.Create
6−import Data.Set.Lens
7+import Data.List.Split
7import Data.Set ( Set )
8import Data.Set ( Set )
8import qualified Data.Set as Set
9import qualified Data.Set as Set
10+import Data.Set.Lens
9import Distribution.Nixpkgs.Haskell
11import Distribution.Nixpkgs.Haskell
12+import Distribution.Nixpkgs.Meta
10import Distribution.Package
13import Distribution.Package
14+import Distribution.System
11import Distribution.Text
15import Distribution.Text
12import Distribution.Version
16import Distribution.Version
13import Language.Nix
17import Language.Nix
14−import Data.List.Split
15−import Control.Lens
16
18
17postProcess :: Derivation -> Derivation
19postProcess :: Derivation -> Derivation
18postProcess deriv = foldr ($) (fixGtkBuilds deriv) [ f | (Dependency n vr, f) <- hooks, packageName deriv == n, packageVersion deriv `withinRange` vr ]
20postProcess deriv = foldr ($) (fixGtkBuilds deriv) [ f | (Dependency n vr, f) <- hooks, packageName deriv == n, packageVersion deriv `withinRange` vr ]
@@ -38,6 +40,7 @@ hooks =
38 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
40 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
39 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
41 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
40 , ("darcs", set phaseOverrides darcsInstallPostInstall)
42 , ("darcs", set phaseOverrides darcsInstallPostInstall)
43+ , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
41 , ("git-annex", gitAnnexHook)
44 , ("git-annex", gitAnnexHook)
42 , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
45 , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
43 , ("HFuse", set phaseOverrides hfusePreConfigure)
46 , ("HFuse", set phaseOverrides hfusePreConfigure)