From 48c63cb6a66f69c96835076403a29fdbf236570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 14 May 2016 09:15:06 -0300 Subject: [PATCH 1/3] xfce4-screenshooter: add dependency on hicolor_icon_theme --- pkgs/desktops/xfce/applications/xfce4-screenshooter.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 8181b809c83f..570c1105e7fa 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, exo}: +, exo, hicolor_icon_theme }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; + nativeBuildInputs = [ + pkgconfig intltool + ]; + buildInputs = [ - pkgconfig intltool xfce4panel libxfce4util gtk libsoup exo + xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme ]; meta = { From 1498dfd24a720eb9be44562f5b02467643bc9e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 14 May 2016 09:25:25 -0300 Subject: [PATCH 2/3] xfce4-screenshooter: 1.8.1 -> 1.8.2 --- pkgs/desktops/xfce/applications/xfce4-screenshooter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 570c1105e7fa..7e25bfa75b74 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; ver_maj = "1.8"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"; + sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From 1b5de9df061cf572b9c9818ddb7254726f3dcd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 14 May 2016 09:29:09 -0300 Subject: [PATCH 3/3] xfce4: rename package xfce4screenshooter to xfce4-screenshooter --- pkgs/desktops/xfce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 06046bc122b3..0da2756f877f 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -61,7 +61,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; - xfce4screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; + xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; xfce4volumed = let gst = callPackage ./applications/xfce4-volumed.nix { }; pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };