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

...into staging-next
2023-12-31 15:19:24 +01:00
parent 9a9b8c65ac bd956879e8
commit fb20fd98a2
2 changed files with 12 additions and 1 deletions
@@ -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
@@ -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 { };