uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
46
pkgs/applications/misc/xbattbar/default.nix
Normal file
46
pkgs/applications/misc/xbattbar/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib, stdenv, fetchgit, libX11, perl, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xbattbar";
|
||||
version = "1.4.9";
|
||||
|
||||
# The current active upstream of xbattbar seems to be the Debian source
|
||||
# repository.
|
||||
src = fetchgit {
|
||||
url = "https://salsa.debian.org/debian/xbattbar.git";
|
||||
rev = "upstream/${version}";
|
||||
sha256 = "10w7gs0l4hzhdn38yqyr3az7n4ncmfnd6hhhly6lk5dg7k441ck6";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
# The following patches are applied:
|
||||
# - sys-by-default: remove the APM checker binary, make the sys checker
|
||||
# script the default. Rationale: checking battery status by /proc/apm is
|
||||
# extremely oldschool and does not work on NixOS, while the sysfs script
|
||||
# does.
|
||||
# - perl shebang patches for acpi/sys scripts
|
||||
# - unhardcode path to checker scripts
|
||||
patchPhase = ''
|
||||
patch -p1 < ${./sys-by-default.patch}
|
||||
sed -i -e "s,/usr/lib/xbattbar/,$out/libexec/," xbattbar.c
|
||||
sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-acpi
|
||||
sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-sys
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/libexec
|
||||
install -m 0755 xbattbar $out/bin/
|
||||
install -m 0755 xbattbar-check-acpi $out/libexec/
|
||||
install -m 0755 xbattbar-check-sys $out/libexec/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Display battery status in X11";
|
||||
homepage = "https://salsa.debian.org/debian/xbattbar";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.q3k ];
|
||||
};
|
||||
}
|
||||
26
pkgs/applications/misc/xbattbar/sys-by-default.patch
Normal file
26
pkgs/applications/misc/xbattbar/sys-by-default.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/xbattbar.c b/xbattbar.c
|
||||
index 1e26019..cb3eab5 100644
|
||||
--- a/xbattbar.c
|
||||
+++ b/xbattbar.c
|
||||
@@ -75,9 +75,8 @@ char *ONOUT_C = "olive drab";
|
||||
char *OFFIN_C = "blue";
|
||||
char *OFFOUT_C = "red";
|
||||
|
||||
-char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-apm";
|
||||
+char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-sys";
|
||||
char *EXTERNAL_CHECK_ACPI = "/usr/lib/xbattbar/xbattbar-check-acpi";
|
||||
-char *EXTERNAL_CHECK_SYS = "/usr/lib/xbattbar/xbattbar-check-sys";
|
||||
|
||||
int alwaysontop = False;
|
||||
|
||||
@@ -245,10 +244,6 @@ main(int argc, char **argv)
|
||||
EXTERNAL_CHECK = EXTERNAL_CHECK_ACPI;
|
||||
break;
|
||||
|
||||
- case 'r':
|
||||
- EXTERNAL_CHECK = EXTERNAL_CHECK_SYS;
|
||||
- break;
|
||||
-
|
||||
case 's':
|
||||
EXTERNAL_CHECK = optarg;
|
||||
break;
|
||||
Loading…
Add table
Add a link
Reference in a new issue