JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: xdg_utils -> xdg-utils

Browse Source
This commit is contained in:
Ben Siraphob 2021-02-01 15:05:09 +07:00
parent 9fdcac4b9b
commit a6ac3eedbd
45 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/xserver.nix
View File

@ -650,7 +650,7 @@ in
xorg.xprop xorg.xprop
xorg.xauth xorg.xauth
pkgs.xterm pkgs.xterm
pkgs.xdg_utils pkgs.xdg-utils
xorg.xf86inputevdev.out # get evdev.4 man page xorg.xf86inputevdev.out # get evdev.4 man page
] ]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;

4
pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
View File

@ -3,7 +3,7 @@
, libbsd, libjack2, libpng, ffmpeg_3 , libbsd, libjack2, libpng, ffmpeg_3
, libxkbcommon , libxkbcommon
, makeWrapper, pixman, autoPatchelfHook , makeWrapper, pixman, autoPatchelfHook
, xdg_utils, zenity, zlib }: , xdg-utils, zenity, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitwig-studio"; pname = "bitwig-studio";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
xdg_utils zenity ffmpeg_3 xdg-utils zenity ffmpeg_3
]; ];
installPhase = '' installPhase = ''

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype
, gdk-pixbuf, glib, gtk3, lib, xorg , gdk-pixbuf, glib, gtk3, lib, xorg
, libglvnd, libjack2, ffmpeg_3 , libglvnd, libjack2, ffmpeg_3
, libxkbcommon, xdg_utils, zlib, pulseaudio , libxkbcommon, xdg-utils, zlib, pulseaudio
, wrapGAppsHook, makeWrapper }: , wrapGAppsHook, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
xdg_utils ffmpeg_3 xdg-utils ffmpeg_3
]; ];
ldLibraryPath = lib.strings.makeLibraryPath buildInputs; ldLibraryPath = lib.strings.makeLibraryPath buildInputs;

4
pkgs/applications/audio/faust/faust2firefox.nix
View File

@ -1,5 +1,5 @@
{ faust { faust
, xdg_utils , xdg-utils
}: }:
# This just runs faust2svg, then attempts to open a browser using # This just runs faust2svg, then attempts to open a browser using
@ -9,6 +9,6 @@ faust.wrap {
baseName = "faust2firefox"; baseName = "faust2firefox";
runtimeInputs = [ xdg_utils ]; runtimeInputs = [ xdg-utils ];
} }

4
pkgs/applications/misc/avrdudess/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "avrdudess-2.2.20140102"; name = "avrdudess-2.2.20140102";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which # We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment. # 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 # avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

4
pkgs/applications/misc/calibre/default.nix
View File

@ -20,7 +20,7 @@
, python3Packages , python3Packages
, libusb1 , libusb1
, libmtp , libmtp
, xdg_utils , xdg-utils
, makeDesktopItem , makeDesktopItem
, removeReferencesTo , removeReferencesTo
}: }:
@ -84,7 +84,7 @@ mkDerivation rec {
poppler_utils poppler_utils
qtbase qtbase
sqlite sqlite
xdg_utils xdg-utils
] ++ ( ] ++ (
with python3Packages; [ with python3Packages; [
apsw apsw

4
pkgs/applications/misc/eureka-editor/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "eureka-editor"; pname = "eureka-editor";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv";
}; };
buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/misc/far2l/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, { 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 let
newer-colorer-schemes = fetchFromGitHub { newer-colorer-schemes = fetchFromGitHub {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'' + '' '' + ''
echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh
substituteInPlace far2l/bootstrap/open.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 \ substituteInPlace far2l/vtcompletor.cpp \
--replace '"/bin/bash"' '"${bash}/bin/bash"' --replace '"/bin/bash"' '"${bash}/bin/bash"'
substituteInPlace multiarc/src/formats/zip/zip.cpp \ substituteInPlace multiarc/src/formats/zip/zip.cpp \

4
pkgs/applications/misc/fff/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "fff"; pname = "fff";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
}; };
pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); pathAdd = lib.makeSearchPath "bin" ([ xdg-utils file coreutils w3m xdotool ]);
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bashInteractive ]; buildInputs = [ bashInteractive ];

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -97,7 +97,7 @@ in buildFHSUserEnv {
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd 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" # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"

4
pkgs/applications/misc/qdirstat/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, qmake { lib, fetchFromGitHub, qmake
, coreutils, xdg_utils, bash , coreutils, xdg-utils, bash
, makeWrapper, perlPackages, mkDerivation }: , makeWrapper, perlPackages, mkDerivation }:
let let
@ -28,7 +28,7 @@ mkDerivation {
for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp
do do
substituteInPlace $i \ substituteInPlace $i \
--replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open
done done
for i in src/Cleanup.cpp src/cleanup-config-page.ui for i in src/Cleanup.cpp src/cleanup-config-page.ui
do do

8
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -38,7 +38,7 @@
, udev , udev
, xorg , xorg
, zlib , zlib
, xdg_utils , xdg-utils
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -79,7 +79,7 @@ rpath = lib.makeLibraryPath [
nss nss
pango pango
udev udev
xdg_utils xdg-utils
xorg.libxcb xorg.libxcb
zlib zlib
]; ];
@ -144,8 +144,8 @@ stdenv.mkDerivation rec {
done done
# Replace xdg-settings and xdg-mime # Replace xdg-settings and xdg-mime
ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
''; '';
installCheckPhase = '' installCheckPhase = ''

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -4,7 +4,7 @@
, gnutar, bzip2, flac, speex, libopus , gnutar, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy , libevent, expat, libjpeg, snappy
, libpng, libcap , libpng, libcap
, xdg_utils, yasm, nasm, minizip, libwebp , xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2 , libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config , python2Packages, perl, pkg-config
@ -89,7 +89,7 @@ let
bzip2 flac speex opusWithCustomModes bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy libevent expat libjpeg snappy
libpng libcap libpng libcap
xdg_utils minizip libwebp xdg-utils minizip libwebp
libusb1 re2 libusb1 re2
ffmpeg libxslt libxml2 ffmpeg libxslt libxml2
nasm nasm
@ -196,7 +196,7 @@ let
'/usr/share/locale/' \ '/usr/share/locale/' \
'${glibc}/share/locale/' '${glibc}/share/locale/'
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc chrome/browser/shell_integration_linux.cc
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper { newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, pipewire_0_2 , pipewire_0_2
@ -190,7 +190,7 @@ in stdenv.mkDerivation {
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
# Mainly for xdg-open but also other xdg-* tools: # Mainly for xdg-open but also other xdg-* tools:
export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH"
. .
w w

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in ## various stuff that can be plugged in
, flashplayer, hal-flash , flashplayer, hal-flash
@ -265,7 +265,7 @@ let
--suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix PATH ':' "${xdg_utils}/bin" \ --prefix PATH ':' "${xdg-utils}/bin" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -22,7 +22,7 @@
# Additional dependencies according to other distros. # Additional dependencies according to other distros.
## Ubuntu ## Ubuntu
, liberation_ttf, curl, util-linux, xdg_utils, wget , liberation_ttf, curl, util-linux, xdg-utils, wget
## Arch Linux. ## Arch Linux.
, flac, harfbuzz, icu, libpng, libopus, snappy, speechd , flac, harfbuzz, icu, libpng, libopus, snappy, speechd
## Gentoo ## Gentoo
@ -57,7 +57,7 @@ let
dbus gdk-pixbuf gcc-unwrapped.lib dbus gdk-pixbuf gcc-unwrapped.lib
systemd systemd
libexif libexif
liberation_ttf curl util-linux xdg_utils wget liberation_ttf curl util-linux xdg-utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils kerberos libdrm mesa coreutils

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -12,7 +12,7 @@
, sqlite , sqlite
, tinyxml , tinyxml
, wxGTK30-gtk3 , wxGTK30-gtk3
, xdg_utils , xdg-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
tinyxml tinyxml
wxGTK30-gtk3 wxGTK30-gtk3
wxGTK30-gtk3.gtk wxGTK30-gtk3.gtk
xdg_utils xdg-utils
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/networking/instant-messengers/franz/generic.nix
View File

@ -22,7 +22,7 @@
, expat , expat
, udev , udev
, libnotify , libnotify
, xdg_utils , xdg-utils
}: }:
# Helper function for building a derivation for Franz and forks. # Helper function for building a derivation for Franz and forks.
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapProgram $out/opt/${name}/${pname} \ wrapProgram $out/opt/${name}/${pname} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
--prefix PATH : ${xdg_utils}/bin \ --prefix PATH : ${xdg-utils}/bin \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
''; '';
} }

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
, libGL, xcbutilkeysyms, xdg_utils, libtool }: , libGL, xcbutilkeysyms, xdg-utils, libtool }:
let let
version = "4.30.5.1682"; version = "4.30.5.1682";
rpath = lib.makeLibraryPath [ rpath = lib.makeLibraryPath [
xdg_utils xdg-utils
xorg.libXext xorg.libXext
xorg.libSM xorg.libSM
xorg.libICE xorg.libICE

4
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -31,7 +31,7 @@
, nss , nss
, pango , pango
, systemd , systemd
, xdg_utils , xdg-utils
, xorg , xorg
}: }:
@ -151,7 +151,7 @@ let
rm $out/bin/slack rm $out/bin/slack
makeWrapper $out/lib/slack/slack $out/bin/slack \ makeWrapper $out/lib/slack/slack $out/bin/slack \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
# Fix the desktop link # Fix the desktop link
substituteInPlace $out/share/applications/slack.desktop \ substituteInPlace $out/share/applications/slack.desktop \

4
pkgs/applications/networking/instant-messengers/teams/default.nix
View File

@ -10,7 +10,7 @@
, at-spi2-atk , at-spi2-atk
, coreutils , coreutils
, gawk , gawk
, xdg_utils , xdg-utils
, systemd }: , systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg_utils}/bin") gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin")
''; '';
installPhase = '' installPhase = ''

4
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja
, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft , qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft
, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected
, range-v3 , range-v3
}: }:
@ -26,7 +26,7 @@ mkDerivation rec {
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix PATH : ${xdg_utils}/bin" "--prefix PATH : ${xdg-utils}/bin"
]; ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -5,7 +5,7 @@
, tl-expected, hunspell , tl-expected, hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils , xdg-utils
}: }:
with lib; with lib;
@ -83,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \ wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg_utils}/bin \ --prefix PATH : ${xdg-utils}/bin \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \ sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

4
pkgs/applications/networking/instant-messengers/wavebox/default.nix
View File

@ -1,5 +1,5 @@
{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify { alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify
, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg_utils , makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils
, xorg , xorg
}: }:
@ -54,7 +54,7 @@ in stdenv.mkDerivation {
postFixup = '' postFixup = ''
makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/remote/teamviewer/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc , qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes , libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes
, wrapQtAppsHook , wrapQtAppsHook
@ -36,7 +36,7 @@ mkDerivation rec {
ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications
ln -s /var/lib/teamviewer $out/share/teamviewer/config ln -s /var/lib/teamviewer $out/share/teamviewer/config
ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
for i in 16 20 24 32 48 256; do for i in 16 20 24 32 48 256; do
size=$i"x"$i size=$i"x"$i

4
pkgs/applications/office/mytetra/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: { lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }:
let let
version = "1.44.55"; version = "1.44.55";
@ -26,7 +26,7 @@ in mkDerivation {
postFixup = '' postFixup = ''
wrapProgram $out/bin/mytetra \ wrapProgram $out/bin/mytetra \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/terminal-emulators/alacritty/default.nix
View File

@ -23,7 +23,7 @@
, libxcb , libxcb
, libxkbcommon , libxkbcommon
, wayland , wayland
, xdg_utils , xdg-utils
# Darwin Frameworks # Darwin Frameworks
, AppKit , AppKit
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec {
postPatch = '' postPatch = ''
substituteInPlace alacritty/src/config/mouse.rs \ substituteInPlace alacritty/src/config/mouse.rs \
--replace xdg-open ${xdg_utils}/bin/xdg-open --replace xdg-open ${xdg-utils}/bin/xdg-open
''; '';
installPhase = '' installPhase = ''

4
pkgs/applications/terminal-emulators/wayst/default.nix
View File

@ -13,7 +13,7 @@
, wayland , wayland
, libnotify , libnotify
, xdg_utils , xdg-utils
, makeDesktopItem , makeDesktopItem
}: }:
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace src/settings.c \ substituteInPlace src/settings.c \
--replace xdg-open ${xdg_utils}/bin/xdg-open --replace xdg-open ${xdg-utils}/bin/xdg-open
substituteInPlace src/main.c \ substituteInPlace src/main.c \
--replace notify-send ${libnotify}/bin/notify-send --replace notify-send ${libnotify}/bin/notify-send
''; '';

4
pkgs/applications/version-management/git-and-tools/git-open/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: {lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-open"; pname = "git-open";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp git-open $out/bin cp git-open $out/bin
wrapProgram $out/bin/git-open \ wrapProgram $out/bin/git-open \
--prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}" --prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}"
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/version-management/git-and-tools/lab/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: { lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }:
buildGoModule rec { buildGoModule rec {
pname = "lab"; pname = "lab";
@ -22,7 +22,7 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}";
for shell in bash fish zsh; do for shell in bash fish zsh; do
$out/bin/lab completion $shell > lab.$shell $out/bin/lab completion $shell > lab.$shell
installShellCompletion lab.$shell installShellCompletion lab.$shell

4
pkgs/applications/version-management/rabbitvcs/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: { fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "rabbitvcs"; pname = "rabbitvcs";
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
}; };
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ];
prePatch = '' prePatch = ''
sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py

4
pkgs/applications/version-management/sparkleshare/default.nix
View File

@ -19,7 +19,7 @@
stdenv, stdenv,
symlinkJoin, symlinkJoin,
webkit2-sharp, webkit2-sharp,
xdg_utils, xdg-utils,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
mono mono
openssh openssh
openssl openssl
xdg_utils xdg-utils
]; ];
}}/bin \ }}/bin \
--set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [

6
pkgs/applications/video/manim/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch
, cairo, ffmpeg_3, sox, xdg_utils, texlive , cairo, ffmpeg_3, sox, xdg-utils, texlive
, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub
, pbr, fetchPypi , pbr, fetchPypi
}: }:
@ -28,14 +28,14 @@ buildPythonApplication rec {
pycairo pycairo
pydub pydub
cairo sox ffmpeg_3 xdg_utils cairo sox ffmpeg_3 xdg-utils
]; ];
# Test with texlive to see whether it works but don't propagate # Test with texlive to see whether it works but don't propagate
# because it's huge and optional # because it's huge and optional
# TODO: Use smaller TexLive distribution # TODO: Use smaller TexLive distribution
# Doesn't need everything but it's hard to figure out what it needs # Doesn't need everything but it's hard to figure out what it needs
checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ]; checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ];
# Simple test and complex test with LaTeX # Simple test and complex test with LaTeX
checkPhase = '' checkPhase = ''

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake { lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake
, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2
, withGUI ? true , withGUI ? true
, qtbase ? null , qtbase ? null
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
expat file xdg_utils boost libebml zlib fmt expat file xdg-utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark pcre2 libmatroska libogg libvorbis flac cmark pcre2
] ++ optional stdenv.isDarwin libiconv ] ++ optional stdenv.isDarwin libiconv
++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];

4
pkgs/applications/video/subtitleeditor/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file,
desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook
}: }:
let let
@ -41,7 +41,7 @@ stdenv.mkDerivation {
hicolor-icon-theme hicolor-icon-theme
libsigcxx libsigcxx
libxmlxx libxmlxx
xdg_utils xdg-utils
isocodes isocodes
]; ];

2
pkgs/build-support/appimage/default.nix
View File

@ -66,7 +66,7 @@ rec {
xorg.xrandr xorg.xrandr
which which
perl perl
xdg_utils xdg-utils
iana-etc iana-etc
krb5 krb5
]; ];

4
pkgs/data/documentation/anarchism/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, xdg_utils }: { lib, stdenv, fetchFromGitLab, xdg-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "anarchism"; pname = "anarchism";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace debian/anarchism.desktop \ substituteInPlace debian/anarchism.desktop \
--replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
substituteInPlace debian/anarchism.desktop \ substituteInPlace debian/anarchism.desktop \
--replace "file:///usr" "file://$out" --replace "file:///usr" "file://$out"
''; '';

4
pkgs/desktops/xfce/applications/catfish/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, file, which, intltool, gobject-introspection, { lib, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, dconf, gtk3, python3Packages, findutils, xdg-utils, dconf, gtk3, python3Packages,
wrapGAppsHook wrapGAppsHook
}: }:
@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
python3Packages.dbus-python python3Packages.dbus-python
python3Packages.pygobject3 python3Packages.pygobject3
python3Packages.pexpect python3Packages.pexpect
xdg_utils xdg-utils
findutils findutils
]; ];

4
pkgs/development/mobile/genymotion/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon { stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
, xdg_utils , xdg-utils
# For glewinfo # For glewinfo
, libXmu, libXi, libXext }: , libXmu, libXi, libXext }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
}; };
buildInputs = [ makeWrapper which xdg_utils ]; buildInputs = [ makeWrapper which xdg-utils ];
unpackPhase = '' unpackPhase = ''
mkdir -p phony-home $out/share/applications mkdir -p phony-home $out/share/applications

4
pkgs/development/python-modules/papis/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils { lib, buildPythonPackage, fetchFromGitHub, xdg-utils
, requests, filetype, pyparsing, configparser, arxiv2bib , requests, filetype, pyparsing, configparser, arxiv2bib
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions , click, python-slugify, habanero, isbnlib, typing-extensions
@ -45,7 +45,7 @@ buildPythonPackage rec {
checkInputs = ([ checkInputs = ([
pytest pytestcov pytest pytestcov
]) ++ [ ]) ++ [
xdg_utils xdg-utils
]; ];
# most of the downloader tests and 4 other tests require a network connection # most of the downloader tests and 4 other tests require a network connection

2
pkgs/games/steam/fhsenv.nix
View File

@ -29,7 +29,7 @@ let
# Needed by gdialog, including in the steam-runtime # Needed by gdialog, including in the steam-runtime
perl perl
# Open URLs # Open URLs
xdg_utils xdg-utils
iana-etc iana-etc
# Steam Play / Proton # Steam Play / Proton
python3 python3

4
pkgs/misc/emulators/nestopia/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils
, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libarchive libarchive
libao libao
unzip unzip
xdg_utils xdg-utils
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

4
pkgs/tools/audio/mpris-scrobbler/default.nix
View File

@ -10,7 +10,7 @@
, pkg-config , pkg-config
, scdoc , scdoc
, json_c , json_c
, xdg_utils , xdg-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace src/signon.c \ substituteInPlace src/signon.c \
--replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,11 +1,11 @@
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ]; binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "blueman"; pname = "blueman";

2
pkgs/top-level/all-packages.nix
View File

@ -25854,7 +25854,7 @@ in
xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
xdg_utils = callPackage ../tools/X11/xdg-utils { xdg-utils = callPackage ../tools/X11/xdg-utils {
w3m = w3m-batch; w3m = w3m-batch;
}; };