utillinux: rename to util-linux

This commit is contained in:
Graham Christensen
2020-11-24 12:42:06 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions
@@ -3,7 +3,7 @@
, flex
, zlib
, perlPackages
, utillinux
, util-linux
}:
stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
# so let's make sure it knows where to find it:
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
substituteInPlace creduce/creduce_utils.pm --replace \
lscpu ${utillinux}/bin/lscpu
lscpu ${util-linux}/bin/lscpu
'';
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
, libusb1, tcl, utillinux, coreutils, bash }:
, libusb1, tcl, util-linux, coreutils, bash }:
stdenv.mkDerivation rec {
pname = "usb-modeswitch";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/bin/usb_modeswitch_dispatcher \
--set PATH ${lib.makeBinPath [ utillinux coreutils bash ]}
--set PATH ${lib.makeBinPath [ util-linux coreutils bash ]}
'';
buildInputs = [ libusb1 tcl ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
{ stdenv, fetchFromGitLab, perl, icmake, util-linux }:
stdenv.mkDerivation rec {
pname = "yodl";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
patchShebangs scripts/
substituteInPlace INSTALL.im --replace /usr $out
substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt
'';
# Set TERM because icmbuild calls tput.