From 1b789cb5bc1727b87d4804e817a2f3df95ddc67b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:50:15 +0100 Subject: [PATCH] diopser: fix build with gcc 11+ --- pkgs/applications/audio/diopser/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix index 339eae1a7ca9..67b95aef923f 100644 --- a/pkgs/applications/audio/diopser/default.nix +++ b/pkgs/applications/audio/diopser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor }: @@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx"; }; + patches = [ + (fetchpatch { + name = "fix-gcc-11-build.patch"; + url = "https://github.com/robbert-vdh/diopser/commit/a7284439bd4e23455132e7806a214f9db12efae9.patch"; + hash = "sha256-r3yxhnhPUQ47srhfAKeurpe2xyEBdSvqIbgqs9/6gD4="; + }) + ]; + postUnpack = '' ( cd "$sourceRoot" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..03e8c9dfe4b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3761,7 +3761,7 @@ with pkgs; dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; + diopser = callPackage ../applications/audio/diopser { }; diskonaut = callPackage ../tools/misc/diskonaut { };