Merge #179329: util-linux: 2.37.4 -> 2.38 (into staging)

This commit is contained in:
Vladimír Čunát
2022-07-11 18:13:13 +02:00
2 changed files with 9 additions and 1 deletions
@@ -8,6 +8,8 @@
, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
, systemd
, nlsSupport ? true
, translateManpages ? true
, po4a
}:
stdenv.mkDerivation rec {
@@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
(lib.withFeature systemdSupport "systemd")
(lib.withFeatureAs systemdSupport
"systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/")
(lib.enableFeature translateManpages "poman")
"SYSCONFSTATICDIR=${placeholder "lib"}/lib"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"scanf_cv_type_modifier=ms"
@@ -62,7 +65,9 @@ stdenv.mkDerivation rec {
"usrsbin_execdir=${placeholder "bin"}/sbin"
];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config ]
++ lib.optionals translateManpages [ po4a ];
buildInputs = [ zlib ]
++ lib.optionals pamSupport [ pam ]
++ lib.optionals capabilitiesSupport [ libcap_ng ]
+3
View File
@@ -9705,6 +9705,8 @@ with pkgs;
pngquant = callPackage ../tools/graphics/pngquant { };
po4a = perlPackages.Po4a;
podiff = callPackage ../tools/text/podiff { };
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
@@ -24411,6 +24413,7 @@ with pkgs;
nlsSupport = false;
ncursesSupport = false;
systemdSupport = false;
translateManpages = false;
} else util-linux;
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };