diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
| commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
| tree | 1435af86f0f2172632621a400f27a44599751f17 /pkgs/misc/drivers | |
| parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) | |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/misc/drivers')
| -rw-r--r-- | pkgs/misc/drivers/hplip/3.16.11.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/drivers/hplip/3.18.5.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 452c2c425c1d..4b9f47d88f94 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -2,7 +2,7 @@ , pkgconfig , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux , qtSupport ? true , withPlugin ? false }: @@ -175,7 +175,7 @@ python2Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin ''; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index f9064720fb64..59b3d2b9d634 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -212,7 +212,7 @@ python2Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin ''; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index afd1f8f6fe4f..b740f5091fa7 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux # To remove references to gcc-unwrapped , removeReferencesTo, qt5 , withQt5 ? true @@ -219,7 +219,7 @@ python3Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) '' + stdenv.lib.optionalString withQt5 '' |