dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lvm2: fix static compilation

Browse Source 
This should avoid a infinity recursion issue during static compilation,
by making util-linux not a dependency of the `fix-blkdeactivate.patch`.
This commit is contained in:
Thiago Kenji Okada 2022-04-19 16:32:26 +01:00
parent bf27ea9cdb
commit 582a42ece7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/lvm2/common.nix
View File

@ -4,18 +4,19 @@
, fetchpatch
, fetchurl
, pkg-config
, util-linux
, coreutils
, libuuid
, libaio
, substituteAll
, enableCmdlib ? false
, enableDmeventd ? false
, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null
, udevSupport ? !stdenv.hostPlatform.isStatic, udev
, onlyLib ? stdenv.hostPlatform.isStatic
, enableVDO ? false, vdo ? null
, enableMdadm ? false, mdadm ? null
, enableMultipath ? false, multipath-tools ? null
# Otherwise we have a infinity recursion during static compilation
, enableUtilLinux ? !stdenv.hostPlatform.isStatic, util-linux
, enableVDO ? false, vdo
, enableMdadm ? false, mdadm
, enableMultipath ? false, multipath-tools
, nixosTests
}:
@ -102,7 +103,7 @@ stdenv.mkDerivation rec {
in {
src = ./fix-blkdeactivate.patch;
inherit coreutils;
util_linux = util-linux;
util_linux = optionalTool enableUtilLinux util-linux;
mdadm = optionalTool enableMdadm mdadm;
multipath_tools = optionalTool enableMultipath multipath-tools;
vdo = optionalTool enableVDO vdo;