From 5bd56cc23638a081692dddc13679e72f79aaccec Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 5 Oct 2021 13:06:01 +0000 Subject: [PATCH] util-linux: remove unnecessary perl build input This was probably needed for scriptrelay(1) before it was rewritten from Perl to C in util-linux 2.14. I've checked with Diffoscope that after removing the build input, the result is bit-for-bit identical except for the different prefix. --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 73f321f26318..073f94267b7f 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng -, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: +, ncurses ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { pname = "util-linux"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib pam libcap_ng ] - ++ lib.filter (p: p != null) [ ncurses systemd perl ]; + ++ lib.filter (p: p != null) [ ncurses systemd ]; doCheck = false; # "For development purpose only. Don't execute on production system!" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd63e7444fcb..81c5c92e9b40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22180,7 +22180,6 @@ with pkgs; util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { minimal = true; ncurses = null; - perl = null; systemd = null; }) else util-linux;