diff options
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix | 27 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix | 18 |
3 files changed, 19 insertions, 28 deletions
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index fa666bb556d0..793142fdc18d 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -137,7 +137,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; - xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; + xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix deleted file mode 100644 index c9e5c8befbbb..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }: - -with stdenv.lib; -stdenv.mkDerivation rec { - p_name = "xfce4-verve-plugin"; - ver_maj = "1.1"; - ver_min = "0"; - - src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "114wkmgjxkim1jkswih20zg9d7rbzmlf30b5rlcpvmbsij0ny6d3"; - }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "A command-line plugin"; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix new file mode 100644 index 000000000000..288aaddfb982 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: + +mkXfceDerivation rec { + category = "panel-plugins"; + pname = "xfce4-verve-plugin"; + version = "2.0.0"; + rev = version; + sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; + + buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; + + hardeningDisable = [ "format" ]; + + meta = { + description = "A command-line plugin"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} |