diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-01 15:05:09 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-01 15:05:09 +0700 |
commit | a6ac3eedbd197746dae3be74d3a605741ab44cb9 (patch) | |
tree | 6059fc005bcde08ac52232d351c06258369f053b /pkgs/applications/misc | |
parent | 9fdcac4b9baa1fb96a775ed3ca9dc7f2ce76c96e (diff) |
treewide: xdg_utils -> xdg-utils
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/avrdudess/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/eureka-editor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/far2l/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/fff/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/lutris/fhsenv.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/qdirstat/default.nix | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 696d69c701c9c..29469d9fff915 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" + export PATH="${lib.makeBinPath [ avrdude xdg-utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 47d2ee52f8130..7917975f4f28d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -20,7 +20,7 @@ , python3Packages , libusb1 , libmtp -, xdg_utils +, xdg-utils , makeDesktopItem , removeReferencesTo }: @@ -84,7 +84,7 @@ mkDerivation rec { poppler_utils qtbase sqlite - xdg_utils + xdg-utils ] ++ ( with python3Packages; [ apsw diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 0b5922f8f699c..2e70beb6173ca 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: +{ lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { pname = "eureka-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; }; - buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index c3e9218b58867..f95fb5ed6ecab 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: + xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: let newer-colorer-schemes = fetchFromGitHub { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { '' + '' echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ - --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' + --replace 'xdg-open' '${xdg-utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace multiarc/src/formats/zip/zip.cpp \ diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 2b21c984f34ff..a3f791940cbf5 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg-utils, file, coreutils, w3m, xdotool }: stdenv.mkDerivation rec { pname = "fff"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; - pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); + pathAdd = lib.makeSearchPath "bin" ([ xdg-utils file coreutils w3m xdotool ]); nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bashInteractive ]; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index d7eabae0e8e5a..dbb6301d2862b 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz + vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 7830f2035d9cd..29cd7967e1309 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, qmake -, coreutils, xdg_utils, bash +, coreutils, xdg-utils, bash , makeWrapper, perlPackages, mkDerivation }: let @@ -28,7 +28,7 @@ mkDerivation { for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ - --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open + --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open done for i in src/Cleanup.cpp src/cleanup-config-page.ui do |