diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 7714af9cc544..cb323e623bed 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 382cf1d75c49..22de55f6b8f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };