diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2023-03-08 11:47:39 +0100 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2023-03-08 11:51:15 +0100 |
| commit | 28d86311edbdba8588a8e4d6737179faf85726f7 (patch) | |
| tree | 3693be21da3edcccff5e122216ad90b46ccabc4b /pkgs/applications/window-managers/herbstluftwm | |
| parent | 1bf544bf5e11c0862e4117d0879dc9bc5a6345ec (diff) | |
herbstluftwm: fix tests with gcc12
The herbstluftwm test suite failed since cb5727323607dd9cc1fa12a8147ce21389df6599. We can avoid this by backporting an upstream fix.
Diffstat (limited to 'pkgs/applications/window-managers/herbstluftwm')
| -rw-r--r-- | pkgs/applications/window-managers/herbstluftwm/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index f1d7c585c4430..7bfe0f992746f 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell +, fetchpatch , nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,12 @@ stdenv.mkDerivation rec { patches = [ ./test-path-environment.patch + # Adjust tests for compatibility with gcc 12 (https://github.com/herbstluftwm/herbstluftwm/issues/1512) + # Can be removed with the next release (>0.9.5). + (fetchpatch { + url = "https://github.com/herbstluftwm/herbstluftwm/commit/8678168c7a3307b1271e94974e062799e745ab40.patch"; + hash = "sha256-uI6ErfDitT2Tw0txx4lMSBn/jjiiyL4Qw6AJa/CTh1E="; + }) ]; postPatch = '' |