diff options
author | Felix Buehler <account@buehler.rocks> | 2022-03-01 14:21:26 +0100 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-03-02 11:07:45 -0800 |
commit | bcad3669e8b2b32bdaeace0618f02393121a41bf (patch) | |
tree | 36c560ba38d4f7f771edc76b71306bb5df704272 /pkgs | |
parent | b50d36a69a108a9fa06d02793ca24067e7e4748f (diff) |
util-linuxMinimal: remove appendToName to have a consistent package name for repology
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index bedd2417e7ead..d54f577def3e0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - pname = "util-linux"; + pname = "util-linux" + lib.optionalString ( !nlsSupport && ncurses == null && systemd == null ) "-minimal"; version = "2.37.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b88233d08263..4b39ceb8fb075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23333,11 +23333,11 @@ with pkgs; util-linuxCurses = util-linux; - util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { + util-linuxMinimal = if stdenv.isLinux then util-linux.override { nlsSupport = false; ncurses = null; systemd = null; - }) else util-linux; + } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; |