summary refs log tree commit diff
path: root/pkgs/applications/window-managers/fluxbox
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-09-29 08:08:51 +0100
committerSergei Trofimovich <slyich@gmail.com>2021-09-29 08:10:57 +0100
commitd9015f0986b0a840a2793920b81f6dfa98f26d30 (patch)
treeee8c04851d9ce0965bd223d25a3a3f78c8fe924a /pkgs/applications/window-managers/fluxbox
parent42d7abfe9cb723757a758e55970d75668a161ef5 (diff)
downloadnixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar.gz
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar.bz2
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar.lz
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar.xz
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.tar.zst
nixpkgs-d9015f0986b0a840a2793920b81f6dfa98f26d30.zip
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.
Diffstat (limited to 'pkgs/applications/window-managers/fluxbox')
-rw-r--r--pkgs/applications/window-managers/fluxbox/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index 36a22cb46d7..934f8c9b3fc 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -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 ];