ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19744 from groxxda/gnome-fwdport

Browse Source 
gnome3.22: forward port intermediate changes to 3.20
This commit is contained in:
Luca Bruno 2016-10-23 14:11:41 +01:00 committed by GitHub
commit 062416d4c1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
webkitgtk libsoup libsecret gnome_desktop libnotify libtool webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 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"; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";

4
pkgs/desktops/gnome-3/3.22/default.nix
View File

@ -264,9 +264,7 @@ let
glade = callPackage ./apps/glade { }; glade = callPackage ./apps/glade { };
gnome-boxes = callPackage ./apps/gnome-boxes { gnome-boxes = callPackage ./apps/gnome-boxes { };
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
};
gnome-calendar = callPackage ./apps/gnome-calendar { }; gnome-calendar = callPackage ./apps/gnome-calendar { };

4
pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
View File

@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl 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 = '' preFixup = ''
wrapProgram $out/bin/anjuta \ wrapProgram $out/bin/anjuta \