nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273600 from wegank/diopser-gcc-13

Browse Source 
diopser: fix build with gcc 11+
This commit is contained in:
Weijia Wang 2023-12-12 01:52:37 +01:00 committed by GitHub
commit 9c5db275ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/diopser/default.nix
View File

@ -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"

2
pkgs/top-level/all-packages.nix
View File

@ -3764,7 +3764,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 { };