From 14f1ff80ce42fcfb4ee8e85e7882b3fac8f97cde Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 19 Feb 2016 11:32:01 +0100 Subject: gnome3.eog: 3.18.1 -> 3.18.2 --- pkgs/desktops/gnome-3/3.18/core/eog/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix index 937f1dcaa215..444d66fbb31a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.18.1"; + name = "eog-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/eog/3.18/eog-3.18.1.tar.xz; - sha256 = "7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7"; + url = mirror://gnome/sources/eog/3.18/eog-3.18.2.tar.xz; + sha256 = "dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636"; }; } -- cgit 1.4.1 From 6d6a7881efea68cadd1237a4c3f0bb652a7157b1 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:11:28 +0100 Subject: gnome3.libgxps: Fix dependency propagation bug Packages that want to use libgxps also need libarchive, thus it is moved to propagatedBuildInputs. --- pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix index 72d307f4f1a7..5168dec203fa 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; + buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; + propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; -- cgit 1.4.1 From 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:15:19 +0100 Subject: gnome3.evince: Add XPS file support XPS support is optional via supportXPS argument and turned off by default. --- pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index 154182eef887..3220e9060643 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection +, librsvg, gobjectIntrospection +, recentListSize ? null # 5 is not enough, allow passing a different number +, supportXPS ? false # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { @@ -15,11 +16,12 @@ stdenv.mkDerivation rec { gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre makeWrapper libsecret librsvg gnome3.adwaita-icon-theme - ]; + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ "--disable-nautilus" # Do not use nautilus "--enable-introspection" + (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; -- cgit 1.4.1 From a7d64fef3851dbbf91feadd04e9a9d53e8ca4f07 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 21 Feb 2016 09:24:43 -0300 Subject: xfce4-whiskermenu-plugin: fix xfce4-panel path in xfce4-popup-whiskermenu script --- pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index 420eb128a420..79e84f6470a3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; + preFixup = '' + substituteInPlace $out/bin/xfce4-popup-whiskermenu \ + --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel + ''; + meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Whisker Menu is an alternate application launcher for Xfce."; -- cgit 1.4.1 From aee654870169ef30f757d2d71fc61860b878f310 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 21 Feb 2016 09:51:44 -0300 Subject: xfce4-whiskermenu-plugin: 1.5.1 -> 1.5.2 --- pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index 420eb128a420..bb77f5687357 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -5,8 +5,8 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; ver_maj = "1.5"; - ver_min = "1"; - rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8"; + ver_min = "2"; + rev = "d08418c8d55edfacef190ec14e03e1e9a6988101"; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; inherit rev; - sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76"; + sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx"; }; buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel -- cgit 1.4.1