From 10e3dde91f4f1a4628d295b5dc1716ace194d28f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 2 Nov 2018 00:54:37 +0000 Subject: [PATCH] polybar: nuke reference to stdenv.cc, small clean up --- pkgs/applications/misc/polybar/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 0c358e4221a1..9756e8ca6c4f 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -64,10 +64,15 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then makeWrapper else null) ]; - fixupPhase = if (i3Support || i3GapsSupport) then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" - '' else null; + postConfigure = '' + substituteInPlace ../include/settings.hpp --replace \ + "${stdenv.cc}" "${stdenv.cc.name}" + ''; + + postInstall = if (i3Support || i3GapsSupport) then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" + '' else ""; nativeBuildInputs = [ cmake pkgconfig