git.iko.soy/typeable/cabal2nix
on master help sign in
fltkhs: expand the obsolete 'libGLU_combined' alias

Fixes https://github.com/NixOS/cabal2nix/issues/434.

commit39f6c39f2a54fe97be07ea61cd127358283f903c authorPeter Simons <simons@cryp.to> dateThu 14 Nov 2019, 13:15 (7 years ago) parentbb66e86
2 files changed+1−2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs−1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs−1
@@ -203,7 +203,6 @@ buildToolNixName "nix-env" = return "nix"
203203buildToolNixName "nix-hash" = return "nix"
204204buildToolNixName "nix-instantiate" = return "nix"
205205buildToolNixName "nix-store" = return "nix"
206−buildToolNixName "pkg-config" = return "pkgconfig"
207206buildToolNixName x = return (fromString x)
208207
209208-- | Helper function to extract the package name from a String that may or may
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
@@ -89,7 +89,7 @@ hooks =
8989 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
9090 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
9191 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))
92− , ("fltkhs", set (libraryDepends . system . contains (pkg "fltk14")) True . set (libraryDepends . pkgconfig . contains (pkg "libGLU_combined")) True) -- TODO: fltk14 belongs into the *setup* dependencies.
92+ , ("fltkhs", set (libraryDepends . system . contains (pkg "fltk14")) True . over (libraryDepends . pkgconfig) (Set.union (pkgs ["libGLU", "libGL"]))) -- TODO: fltk14 belongs into the *setup* dependencies.
9393 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
9494 , ("gi-cairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
9595 , ("gi-gdk", set runHaddock True )