mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 04:13:01 +00:00
util-linux: 2.37.4 -> 2.38
https://kernel.org/pub/linux/utils/util-linux/v2.38/v2.38-ReleaseNotes
This commit is contained in:
parent
b69a5525f4
commit
9112270b93
@ -8,15 +8,17 @@
|
||||
, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
|
||||
, systemd
|
||||
, nlsSupport ? true
|
||||
, translateManpages ? true
|
||||
, po4a
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
|
||||
version = "2.37.4";
|
||||
version = "2.38";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
|
||||
sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M=";
|
||||
hash = "sha256-bREcvk1VszbbLx++/7xluJkIcEwBE2Nx0yqpvsNz62Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -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 ]
|
||||
|
@ -24212,6 +24212,7 @@ with pkgs;
|
||||
nlsSupport = false;
|
||||
ncursesSupport = false;
|
||||
systemdSupport = false;
|
||||
translateManpages = false;
|
||||
} else util-linux;
|
||||
|
||||
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
|
||||
|
Loading…
Reference in New Issue
Block a user