utillinux: rename to util-linux
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ stdenv, buildPackages
|
||||
, fetchurl, binutils ? null, bison, autoconf, utillinux
|
||||
, fetchurl, binutils ? null, bison, autoconf, util-linux
|
||||
|
||||
# patch for cygwin requires readline support
|
||||
, interactive ? stdenv.isCygwin, readline70 ? null
|
||||
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
"SHOBJ_LIBS=-lbash"
|
||||
];
|
||||
|
||||
checkInputs = [ utillinux ];
|
||||
checkInputs = [ util-linux ];
|
||||
doCheck = false; # dependency cycle, needs to be interactive
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, buildPackages
|
||||
, fetchurl, binutils ? null, bison, utillinux
|
||||
, fetchurl, binutils ? null, bison, util-linux
|
||||
|
||||
# patch for cygwin requires readline support
|
||||
, interactive ? stdenv.isCygwin, readline80 ? null
|
||||
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
"SHOBJ_LIBS=-lbash"
|
||||
];
|
||||
|
||||
checkInputs = [ utillinux ];
|
||||
checkInputs = [ util-linux ];
|
||||
doCheck = false; # dependency cycle, needs to be interactive
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, lib
|
||||
, fetchurl
|
||||
, coreutils
|
||||
, utillinux
|
||||
, util-linux
|
||||
, which
|
||||
, gnused
|
||||
, gnugrep
|
||||
@@ -178,7 +178,7 @@ let
|
||||
EOF
|
||||
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
sed -e "s| ul| ${utillinux}/bin/ul|" \
|
||||
sed -e "s| ul| ${util-linux}/bin/ul|" \
|
||||
-i "$out/share/fish/functions/__fish_print_help.fish"
|
||||
for cur in $out/share/fish/functions/*.fish; do
|
||||
sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \
|
||||
|
||||
Reference in New Issue
Block a user