diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index b2f6b0aa8a23..fa0a2cc8a600 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.22"; - hash = "sha256-TFppI70aznzgRHRgioSTfOBTupGxrOnwsAFyaOcy3Hw="; + version = "2.03.23"; + hash = "sha256-dOeUqene4bz4ogZfZbkZbET98yHiLWO5jtfejJqhel0="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 7b9cc10be167..97f1eb3a1771 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -103,8 +103,8 @@ stdenv.mkDerivation rec { })) # Musl fix from Alpine ./fix-stdio-usage.patch - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./no-shared.patch + # https://gitlab.com/lvmteam/lvm2/-/merge_requests/8 + ./fix-static.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-static.patch b/pkgs/os-specific/linux/lvm2/fix-static.patch new file mode 100644 index 000000000000..89192744adec --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/fix-static.patch @@ -0,0 +1,28 @@ +From 0cbe7f0adc86c92c61156c417b27b063f156b31b Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Tue, 2 Jan 2024 18:15:20 +0100 +Subject: [PATCH] makefiles: fix disabling shared link + +LIB_SHARED still gets set when shared linking has been disabled, so +the previous version of this check still attempted to build the +shared library. +--- + libdm/make.tmpl.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in +index 2dd9625d4d..69ba2c35ab 100644 +--- a/libdm/make.tmpl.in ++++ b/libdm/make.tmpl.in +@@ -436,7 +436,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 + @echo " [CC] $(