From 8e8f5b90c5e244759bba905a79d6ba72edc86c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 14:19:09 +0200 Subject: [PATCH 1/2] dpkg: 1.22.6 -> 1.22.10 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 162012378034f..811155dff91ba 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.22.6"; + version = "1.22.10"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-iNaBSnxKMKV4u+X4dvDcq7QIxFGROEV0QrbZEJr5kmw="; + hash = "sha256-D/9nQXwzgLo+odn72WHuCJDjipfWdim2ZdSLTI2VlgE="; }; configureFlags = [ From e13e593f1aaedc9898fa2bfdc8aac0f02557490d Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Fri, 2 Aug 2024 14:19:10 +0200 Subject: [PATCH 2/2] dpkg: add CoreServices to fix Darwin build Signed-off-by: Sirio Balmelli --- pkgs/tools/package-management/dpkg/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 811155dff91ba..db095e59c4891 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -14,6 +14,7 @@ , pkg-config , diffutils , glibc ? !stdenv.isDarwin +, darwin }: stdenv.mkDerivation rec { @@ -71,7 +72,8 @@ stdenv.mkDerivation rec { --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" ''; - buildInputs = [ perl zlib bzip2 xz zstd libmd ]; + buildInputs = [ perl zlib bzip2 xz zstd libmd ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ]; postInstall =