mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 11:02:05 +00:00
fluxbox: fix build on gcc-11 (c++17 compat)
On gcc-11 build fails as: $ nix-build -E 'with import ./. { }; fluxbox.override { stdenv = gcc11Stdenv; }' util/fluxbox-remote.cc: In function 'int main(int, char**)': util/fluxbox-remote.cc:76:32: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int') 76 | && text_prop.value > 0 | ~~~~~~~~~~~~~~~~^~~ The change pull upstream fix.
This commit is contained in:
parent
42d7abfe9c
commit
d9015f0986
|
@ -15,6 +15,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream fix to build against gcc-11.
|
||||
(fetchurl {
|
||||
name = "gcc-11.patch";
|
||||
url = "http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f";
|
||||
sha256 = "1x7126rlmzky51lk370fczssgnjs7i6wgfaikfib9pvn4vv945ai";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ];
|
||||
|
|
Loading…
Reference in a new issue