ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 21:57:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge #276789: usbguard: fix build against gcc-13

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-12-31 15:19:24 +01:00
commit fb20fd98a2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/usbguard/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, installShellFiles
, nixosTests
@ -32,6 +33,16 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# Pull upstream fix for gcc-13:
# https://github.com/USBGuard/usbguard/pull/586
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5.patch";
hash = "sha256-yw0ZHcn6naHcsfsqdBB/aTgCwvEHecew/6HDmjyY2ZA=";
})
];
nativeBuildInputs = [
autoreconfHook
installShellFiles

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

@ -28961,7 +28961,7 @@ with pkgs;
upscayl = callPackage ../applications/graphics/upscayl { };
usbguard = disable-warnings-if-gcc13 (callPackage ../os-specific/linux/usbguard { });
usbguard = callPackage ../os-specific/linux/usbguard { };
usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { };