diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/desktops/gnome-3 | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/eog/src.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/yelp/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix index 1aaf23319c4d..f3995e6bc2c6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.20.3"; + name = "eog-3.20.4"; src = fetchurl { url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz; - sha256 = "16308c389deced3acb801dcc180c5e5e18b1db6ba5bd5835b5320cba9b0d2c26"; + sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n"; }; } diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix index 13464137bd8b..4ee79bbc3dc5 100644 --- a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite +, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme + librsvg gdk_pixbuf gnome3.defaultIconTheme groff gnome3.gsettings_desktop_schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; |