JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43927 from volth/xfce4-battery-plugin-1.1.0

Browse Source 
xfce4-13.xfce4-battery-plugin: init at 1.1.0
This commit is contained in:
xeji 2018-07-31 18:08:44 +02:00 committed by GitHub
commit 315a47d249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/xfce4-13/default.nix
View File

@ -44,6 +44,8 @@ makeScope newScope (self: with self; {
xfce4-appfinder = callPackage ./xfce4-appfinder { };
xfce4-battery-plugin = callPackage ./xfce4-battery-plugin { };
xfce4-dev-tools = callPackage ./xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override {
xfce4-dev-tools = null;

8
pkgs/desktops/xfce4-13/mkXfceDerivation.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }:
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }:
{ category, pname, sha256 ? null, version, ... } @ args:
{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
let
inherit (builtins) filter getAttr head isList;
@ -16,12 +16,12 @@ let
name = "${pname}-${version}";
nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
buildInputs = [ hicolor-icon-theme ];
configureFlags = [ "--enable-maintainer-mode" ];
src = fetchgit {
url = "git://git.xfce.org/${category}/${pname}";
rev = name;
inherit sha256;
inherit rev sha256;
};
enableParallelBuilding = true;

11
pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix Normal file
View File

@ -0,0 +1,11 @@
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-battery-plugin";
version = "1.1.0";
rev = version;
sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
}