Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7aab1fff335
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c8479286c77f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 7, 2020

  1. polybar: Don't reference gcc 

    Polybar wants to be capable of printing the compiler that was used to
build it with `polybar -vv` but that makes it reference gcc. See:

https://github.com/polybar/polybar/blob/15e79b09d33c7cac888f93d218ae8be5ae617a2b/src/settings.cpp.cmake#L55
    @doronbehar
    doronbehar committed Jun 7, 2020
    Copy the full SHA
    b64ecc3 View commit details

Commits on Jun 17, 2020

  1. Merge pull request #89716 from doronbehar/polybar-gcc-ref 

    polybar: Don't reference gcc
    @Lassulus
    Lassulus authored Jun 17, 2020
    Copy the full SHA
    c847928 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/applications/misc/polybar/default.nix
7 changes: 6 additions & 1 deletion pkgs/applications/misc/polybar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
, removeReferencesTo

# optional packages-- override the variables ending in 'Support' to enable or
# disable modules
@@ -74,6 +75,10 @@ stdenv.mkDerivation rec {
'' else "";

nativeBuildInputs = [
cmake pkgconfig
cmake pkgconfig removeReferencesTo
];

postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar
'';
}