Add propagatedBuildInputs to shell (#717)
Now that the pkgconfig inputs are here we need this to make them
show up in the shell. Also adds gtkglext pkgconfig mapping.
commit5291959d28c84a57ea922478d91e2c8836b85cb7
authorHamish Mackenzie <Hamish.Mackenzie@iohk.io>
dateSun 21 Jun 2020, 19:40 (6 years ago)
parent9c6eb16
builder/shell-for.nix+2−1
@@ -43,7 +43,8 @@ let
4343
4444 # Add the system libraries and build tools of the selected haskell
4545 # 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);
4748 nativeBuildInputs = removeSelected
4849 (lib.concatMap (p: p.components.all.executableToolDepends) selected);
4950
lib/pkgconf-nixpkgs-map.nix+1
@@ -59,6 +59,7 @@ pkgs:
5959 "gtk+-2.0" = [ pkgs."gtk2" ];
6060 "gtk+-3.0" = [ pkgs."gtk3" ];
6161 "gtk-x11-2.0" = [ pkgs."gtk_x11" ];
62+ "gtkglext-1.0" = [ pkgs.gnome2.gtkglext pkgs.gtk2 ];
6263 "gtksourceview-3.0" = [ pkgs."gtksourceview3" ];
6364 "hidapi-libusb" = [ pkgs."hidapi" ];
6465 "icudata" = [ pkgs."icu" ];