git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix for haskell-gi packages (#148)
e632534Hamish Mackenzie
builder/comp-builder.nix+5−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -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 }:
2
2
3{ componentId
3{ componentId
4, component
4, component
@@ -132,7 +132,10 @@ stdenv.mkDerivation ({
132
132
133 buildInputs = component.libs
133 buildInputs = component.libs
134 ++ component.frameworks
134 ++ 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;
136
139
137 nativeBuildInputs =
140 nativeBuildInputs =
138 [shellWrappers buildPackages.removeReferencesTo]
141 [shellWrappers buildPackages.removeReferencesTo]
lib/pkgconf-nixpkgs-map.nix+1
@@ -13,6 +13,7 @@ pkgs:
13 "b2" = [ pkgs."libb2" ];
13 "b2" = [ pkgs."libb2" ];
14 "bz2" = [ pkgs."bzip2" ];
14 "bz2" = [ pkgs."bzip2" ];
15 "c++" = []; # What is that?
15 "c++" = []; # What is that?
16+ "cairo-1.0" = [ pkgs."cairo" ];
16 "cairo-gobject" = [ pkgs."cairo" ];
17 "cairo-gobject" = [ pkgs."cairo" ];
17 "cairo-pdf" = [ pkgs."cairo" ];
18 "cairo-pdf" = [ pkgs."cairo" ];
18 "cairo-ps" = [ pkgs."cairo" ];
19 "cairo-ps" = [ pkgs."cairo" ];