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/applications/misc | |
parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) | |
download | nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.gz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.bz2 nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.lz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.xz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.zst nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.zip |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/clight/clightd.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/clipmenu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/corectrl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/imag/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/lutris/fhsenv.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/multibootusb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/todoist-electron/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/udevil/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/vifm/default.nix | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index c06d00ebb52..e1f019ffa45 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , dbus, cmake, pkgconfig , glib, udev, polkit, libmodule -, pcre, libXdmcp, utillinux, libpthreadstubs +, pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext , enableGamma ? true, libXrandr @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pcre libXdmcp - utillinux + util-linux libpthreadstubs ] ++ optional enableDdc ddcutil ++ optional enableDpms libXext diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 54c2ab48f65..3227792d6a2 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ]; in stdenv.mkDerivation rec { pname = "clipmenu"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index cee390d064d..090a63a32e4 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -7,7 +7,7 @@ , libdrm , mesa-demos , procps -, utillinux +, util-linux , vulkan-tools , qtbase , qtcharts @@ -40,7 +40,7 @@ stdenv.mkDerivation rec{ libdrm mesa-demos procps - utillinux + util-linux vulkan-tools qtbase qtcharts diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index f00433a658f..f3d4e156d6c 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -7,7 +7,7 @@ , installShellFiles , Security , gitMinimal -, utillinuxMinimal +, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal utillinuxMinimal ]; + checkInputs = [ gitMinimal util-linuxMinimal ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 2b656775ab5..d7eabae0e8e 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -103,7 +103,7 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap - ocl-icd utillinux libkrb5 + ocl-icd util-linux libkrb5 # Proton libselinux diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 8f90c7a581d..c1c7b5a2706 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -30,7 +30,7 @@ python36Packages.buildPythonApplication rec { gnugrep which parted - utillinux + util-linux qemu p7zip gnused diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e1d578edb0f..6e59395f411 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf , gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat -, udev, libpulseaudio, utillinux, makeWrapper }: +, udev, libpulseaudio, util-linux, makeWrapper }: stdenv.mkDerivation rec { pname = "todoist-electron"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = let libPath = lib.makeLibraryPath ([ stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - nss nspr alsaLib libpulseaudio cups expat udev utillinux + nss nspr alsaLib libpulseaudio cups expat udev util-linux ] ++ (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index dbf721888df..8e01f73f967 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }: +{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { @@ -13,9 +13,9 @@ stdenv.mkDerivation { substituteInPlace src/Makefile.in --replace 4755 0755 ./configure \ --prefix=$out \ - --with-mount-prog=${utillinux}/bin/mount \ - --with-umount-prog=${utillinux}/bin/umount \ - --with-losetup-prog=${utillinux}/bin/losetup \ + --with-mount-prog=${util-linux}/bin/mount \ + --with-umount-prog=${util-linux}/bin/umount \ + --with-losetup-prog=${util-linux}/bin/losetup \ --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index b014543e8ce..2c388e58fe1 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper , pkgconfig , ncurses, libX11 -, utillinux, file, which, groff +, util-linux, file, which, groff # adds support for handling removable media (vifm-media). Linux only! , mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ ncurses libX11 utillinux file which groff ]; + buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let path = lib.makeBinPath |