cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

polybar: Remove i3-gaps support

Browse source 
Breaks when no aliases are enabled since #208861
This commit is contained in:
Janne Heß 2023-01-10 14:15:20 +01:00
parent dfa3f14493
commit 7d4e95ba75
No known key found for this signature in database
GPG key ID: 69165158F05265DF
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/misc/polybar/default.nix
View file

@ -28,7 +28,6 @@
, wirelesstools , wirelesstools
, libnl , libnl
, i3 , i3
, i3-gaps
, jsoncpp , jsoncpp
# override the variables ending in 'Support' to enable or disable modules # override the variables ending in 'Support' to enable or disable modules
@ -39,7 +38,6 @@
, iwSupport ? false , iwSupport ? false
, nlSupport ? true , nlSupport ? true
, i3Support ? false , i3Support ? false
, i3GapsSupport ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -59,7 +57,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
python3Packages.sphinx python3Packages.sphinx
removeReferencesTo removeReferencesTo
] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; ] ++ lib.optional i3Support makeWrapper;
buildInputs = [ buildInputs = [
cairo cairo
@ -82,9 +80,7 @@ stdenv.mkDerivation rec {
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio
++ lib.optional iwSupport wirelesstools ++ lib.optional iwSupport wirelesstools
++ lib.optional nlSupport libnl ++ lib.optional nlSupport libnl
++ lib.optional (i3Support || i3GapsSupport) jsoncpp ++ lib.optionals i3Support [ jsoncpp i3 ];
++ lib.optional i3Support i3
++ lib.optional i3GapsSupport i3-gaps;
patches = [ ./remove-hardcoded-etc.diff ]; patches = [ ./remove-hardcoded-etc.diff ];
@ -95,16 +91,10 @@ stdenv.mkDerivation rec {
''; '';
postInstall = postInstall =
if i3Support then '' lib.optionalString i3Support ''
wrapProgram $out/bin/polybar \ wrapProgram $out/bin/polybar \
--prefix PATH : "${i3}/bin" --prefix PATH : "${i3}/bin"
'' '';
else if i3GapsSupport
then ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${i3-gaps}/bin"
''
else "";
postFixup = '' postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar remove-references-to -t ${stdenv.cc} $out/bin/polybar

1
pkgs/top-level/all-packages.nix
View file

@ -31159,7 +31159,6 @@ with pkgs;
iwSupport = false; iwSupport = false;
nlSupport = true; nlSupport = true;
i3Support = true; i3Support = true;
i3GapsSupport = false;
}; };
yambar = callPackage ../applications/misc/yambar { }; yambar = callPackage ../applications/misc/yambar { };