ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26254 from boomshroom/fix/i3block-scripts

Browse Source 
i3blocks: add optional dependencies for scripts
This commit is contained in:
Jörg Thalheim 2017-06-10 11:05:48 +01:00 committed by GitHub
commit f56d83761c
2 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/window-managers/i3/blocks-gaps.nix
View File

@ -1,5 +1,16 @@
{ fetchFromGitHub, stdenv }: { fetchFromGitHub, stdenv, perl, makeWrapper
, iproute, acpi, sysstat, alsaUtils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ]
}:
with stdenv.lib;
let
perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ];
contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3blocks-gaps-${version}"; name = "i3blocks-gaps-${version}";
version = "1.4"; version = "1.4";
@ -14,6 +25,22 @@ stdenv.mkDerivation rec {
makeFlags = "all"; makeFlags = "all";
installFlags = "PREFIX=\${out} VERSION=${version}"; installFlags = "PREFIX=\${out} VERSION=${version}";
buildInputs = optional (contains_any scripts perlscripts) perl;
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
wrapProgram $out/libexec/i3blocks/bandwidth \
--prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
wrapProgram $out/libexec/i3blocks/battery \
--prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
wrapProgram $out/libexec/i3blocks/cpu_usage \
--prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps";
homepage = https://github.com/Airblader/i3blocks-gaps; homepage = https://github.com/Airblader/i3blocks-gaps;

42
pkgs/applications/window-managers/i3/blocks.nix
View File

@ -1,5 +1,19 @@
{ fetchurl, stdenv }: { fetchurl, stdenv, perl, makeWrapper
, iproute, acpi, sysstat, xset, playerctl
, cmus, openvpn, lm_sensors, alsaUtils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"keyindicator" "load_average" "mediaplayer" "memory"
"openvpn" "temperature" "volume" "wifi" ]
}:
with stdenv.lib;
let
perlscripts = [ "battery" "cpu_usage" "keyindicator"
"mediaplayer" "openvpn" "temperature" ];
contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3blocks-${version}"; name = "i3blocks-${version}";
version = "1.4"; version = "1.4";
@ -12,7 +26,31 @@ stdenv.mkDerivation rec {
buildFlags = "SYSCONFDIR=/etc all"; buildFlags = "SYSCONFDIR=/etc all";
installFlags = "PREFIX=\${out} VERSION=${version}"; installFlags = "PREFIX=\${out} VERSION=${version}";
meta = with stdenv.lib; { buildInputs = optional (contains_any scripts perlscripts) perl;
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
wrapProgram $out/libexec/i3blocks/bandwidth \
--prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
wrapProgram $out/libexec/i3blocks/battery \
--prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
wrapProgram $out/libexec/i3blocks/cpu_usage \
--prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
wrapProgram $out/libexec/i3blocks/keyindicator \
--prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)}
wrapProgram $out/libexec/i3blocks/mediaplayer \
--prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])}
wrapProgram $out/libexec/i3blocks/openvpn \
--prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)}
wrapProgram $out/libexec/i3blocks/temperature \
--prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)}
wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
'';
meta = {
description = "A flexible scheduler for your i3bar blocks"; description = "A flexible scheduler for your i3bar blocks";
homepage = https://github.com/vivien/i3blocks; homepage = https://github.com/vivien/i3blocks;
license = licenses.gpl3; license = licenses.gpl3;