Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8d18e2e9140
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95ec6cf00f22
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 8, 2018

  1. PostProcess: add missing system dependencies for gtkglext

    @peti
    peti committed Nov 8, 2018
    Copy the full SHA
    95ec6cf View commit details
Showing with 13 additions and 0 deletions.
  1. +13 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
13 changes: 13 additions & 0 deletions src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
View file
Original file line number Diff line number Diff line change
@@ -108,6 +108,7 @@ hooks =
, ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
, ("graphviz", set (testDepends . system . contains (pkg "graphviz")) True)
, ("gtk3", gtk3Hook)
, ("gtkglext", gtkglextHook)
, ("haddock", haddockHook) -- https://github.com/haskell/haddock/issues/511
, ("hakyll", set (testDepends . tool . contains (pkg "utillinux")) True) -- test suite depends on "rev"
, ("haskell-src-exts", set doCheck False)
@@ -363,3 +364,15 @@ cabal2nixOverrides = set phaseOverrides $ unlines
, " export HOME=\"$TMPDIR/home\""
, "'';"
]

gtkglextHook :: Derivation -> Derivation
gtkglextHook = over (libraryDepends . system) (Set.union (Set.fromList deps))
where
deps :: [Binding]
deps = [ "gtk2-dev = pkgs.gtk2.dev"
, "libGLU-dev = pkgs.libGLU.dev"
, "libSM-dev = pkgs.xorg.libSM.dev"
, "libICE-dev = pkgs.xorg.libICE.dev"
, "libXt-dev = pkgs.xorg.libXt.dev"
, "libXmu-dev = pkgs.xorg.libXmu.dev"
]