From b7f2cd8bd87db3dadf9afad30ef415bc7ba8b41f Mon Sep 17 00:00:00 2001 From: Igor Brylev Date: Tue, 24 Dec 2024 12:44:57 +0300 Subject: [PATCH] gz-transport-vendor: add libsodium to buildInputs --- distros/jazzy/overrides.nix | 8 ++++++-- distros/rolling/overrides.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/distros/jazzy/overrides.nix b/distros/jazzy/overrides.nix index fde5afcdd1..687cf67c86 100644 --- a/distros/jazzy/overrides.nix +++ b/distros/jazzy/overrides.nix @@ -154,10 +154,14 @@ in { ''; }); - gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { + gz-transport-vendor = (lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { version = "13.4.0"; hash = "sha256-2Akd3vKr07IdgoJppvUV1nZlHE4RdQfI2R18ihHTDHk="; - }; + }).overrideAttrs({ + buildInputs ? [], ... + }: { + buildInputs = buildInputs ++ [ self.libsodium ]; + }); gz-utils-vendor = lib.patchGzAmentVendorGit rosSuper.gz-utils-vendor { version = "2.2.0"; diff --git a/distros/rolling/overrides.nix b/distros/rolling/overrides.nix index 180462e328..f53e0ac002 100644 --- a/distros/rolling/overrides.nix +++ b/distros/rolling/overrides.nix @@ -154,10 +154,14 @@ in { ''; }); - gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { + gz-transport-vendor = (lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { version = "14.0.0"; hash = "sha256-zoGphy2cpmqJsnyS1LNVm4eGtHCWkAwIblga4RdVj4k="; - }; + }).overrideAttrs({ + buildInputs ? [], ... + }: { + buildInputs = buildInputs ++ [ self.libsodium ]; + }); gz-utils-vendor = lib.patchGzAmentVendorGit rosSuper.gz-utils-vendor { version = "3.0.0";