forked from mirrors/nixpkgs
Merge pull request #19744 from groxxda/gnome-fwdport
gnome3.22: forward port intermediate changes to 3.20
This commit is contained in:
commit
062416d4c1
|
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
|
|||
webkitgtk libsoup libsecret gnome_desktop libnotify libtool
|
||||
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
|
||||
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
|
||||
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ];
|
||||
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
|
||||
gnome3.glib_networking ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
|
|
|
@ -264,9 +264,7 @@ let
|
|||
|
||||
glade = callPackage ./apps/glade { };
|
||||
|
||||
gnome-boxes = callPackage ./apps/gnome-boxes {
|
||||
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
|
||||
};
|
||||
gnome-boxes = callPackage ./apps/gnome-boxes { };
|
||||
|
||||
gnome-calendar = callPackage ./apps/gnome-calendar { };
|
||||
|
||||
|
|
|
@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
|
||||
gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ];
|
||||
gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
|
||||
gnome3.gsettings_desktop_schemas
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/anjuta \
|
||||
|
|
Loading…
Reference in a new issue