5291959 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Add propagatedBuildInputs to shell (#717)

5291959Hamish Mackenzie6 years ago

builder/shell-for.nix+2−1

@@ -43,7 +43,8 @@ let

44 # Add the system libraries and build tools of the selected haskell

45 # packages to the shell.

46− systemInputs = removeSelectedInputs (lib.concatMap (p: p.components.all.buildInputs) selected);

46+ systemInputs = removeSelectedInputs (lib.concatMap

47+ (p: p.components.all.buildInputs ++ p.components.all.propagatedBuildInputs) selected);

47 nativeBuildInputs = removeSelected

48 nativeBuildInputs = removeSelected

48 (lib.concatMap (p: p.components.all.executableToolDepends) selected);

49 (lib.concatMap (p: p.components.all.executableToolDepends) selected);

lib/pkgconf-nixpkgs-map.nix+1

@@ -59,6 +59,7 @@ pkgs:

59 "gtk+-2.0" = [ pkgs."gtk2" ];

60 "gtk+-3.0" = [ pkgs."gtk3" ];

61 "gtk-x11-2.0" = [ pkgs."gtk_x11" ];

62+ "gtkglext-1.0" = [ pkgs.gnome2.gtkglext pkgs.gtk2 ];

62 "gtksourceview-3.0" = [ pkgs."gtksourceview3" ];

63 "gtksourceview-3.0" = [ pkgs."gtksourceview3" ];

63 "hidapi-libusb" = [ pkgs."hidapi" ];

64 "hidapi-libusb" = [ pkgs."hidapi" ];

64 "icudata" = [ pkgs."icu" ];

65 "icudata" = [ pkgs."icu" ];