alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #220133 from timokau/hlwm-gcc12

Browse source 
herbstluftwm: fix tests with gcc12
This commit is contained in:
Timo Kaufmann 2023-03-13 09:11:16 +01:00 committed by GitHub
parent 1b3f2a22a1 28d86311ed
commit f1ff114ef6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/window-managers/herbstluftwm/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc
, xdotool, xorgserver, xsetroot, xterm, runtimeShell , xdotool, xorgserver, xsetroot, xterm, runtimeShell
, fetchpatch
, nixosTests }: , nixosTests }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -44,6 +45,12 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./test-path-environment.patch ./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 = '' postPatch = ''