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

Merge pull request #49622 from pbogdan/polybar-cc

Browse Source 
polybar: nuke reference to stdenv.cc, small clean up
This commit is contained in:
Franz Pletz 2018-11-02 01:35:39 +00:00 committed by GitHub
commit 5ae33b77a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/polybar/default.nix
View File

@ -64,10 +64,15 @@ stdenv.mkDerivation rec {
(if i3Support || i3GapsSupport then makeWrapper else null) (if i3Support || i3GapsSupport then makeWrapper else null)
]; ];
fixupPhase = if (i3Support || i3GapsSupport) then '' postConfigure = ''
wrapProgram $out/bin/polybar \ substituteInPlace ../include/settings.hpp --replace \
--prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" "${stdenv.cc}" "${stdenv.cc.name}"
'' else null; '';
postInstall = if (i3Support || i3GapsSupport) then ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
'' else "";
nativeBuildInputs = [ nativeBuildInputs = [
cmake pkgconfig cmake pkgconfig