forked from mirrors/nixpkgs
Merge pull request #220133 from timokau/hlwm-gcc12
herbstluftwm: fix tests with gcc12
This commit is contained in:
commit
f1ff114ef6
|
@ -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 = ''
|
||||
|
|
Loading…
Reference in a new issue