git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix for haskell-gi packages (#148)

* Fix for haskell-gi packages * Add comment explaining the hacky gi-* workaround

commite632534506bac0da8bc5d893ab918275fb70508d authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateMon 3 Jun 2019, 01:14 (7 years ago) parent26c5b7b
2 files changed+6−2
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+5−2 lib/pkgconf-nixpkgs-map.nix+1
builder/comp-builder.nix+5−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPackages, ghc, lib, pkgconfig, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs }:
1+{ stdenv, buildPackages, ghc, lib, pkgconfig, gobject-introspection, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs }:
22
33{ componentId
44, component
@@ -132,7 +132,10 @@ stdenv.mkDerivation ({
132132
133133 buildInputs = component.libs
134134 ++ component.frameworks
135− ++ builtins.concatLists component.pkgconfig;
135+ ++ builtins.concatLists component.pkgconfig
136+ # Note: This is a hack until we can fix properly. See:
137+ # https://github.com/haskell-gi/haskell-gi/issues/226
138+ ++ lib.optional (lib.strings.hasPrefix "gi-" fullName) gobject-introspection;
136139
137140 nativeBuildInputs =
138141 [shellWrappers buildPackages.removeReferencesTo]
lib/pkgconf-nixpkgs-map.nix+1
@@ -13,6 +13,7 @@ pkgs:
1313 "b2" = [ pkgs."libb2" ];
1414 "bz2" = [ pkgs."bzip2" ];
1515 "c++" = []; # What is that?
16+ "cairo-1.0" = [ pkgs."cairo" ];
1617 "cairo-gobject" = [ pkgs."cairo" ];
1718 "cairo-pdf" = [ pkgs."cairo" ];
1819 "cairo-ps" = [ pkgs."cairo" ];