diff options
author | Artturin <Artturin@artturin.com> | 2022-05-15 05:08:10 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-05-15 05:19:23 +0300 |
commit | 1a634cc0577f4bf55b9556ecf8aa721c3ec865e3 (patch) | |
tree | 482f33bed501e3082b38f60d34866eac3d4f7140 /pkgs/applications/networking | |
parent | be2ceab96f3aee5e586a427a2d28331ccbd4c7da (diff) | |
download | nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar.gz nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar.bz2 nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar.lz nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar.xz nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.tar.zst nixpkgs-1a634cc0577f4bf55b9556ecf8aa721c3ec865e3.zip |
treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
they're unnecessary since https://github.com/NixOS/nixpkgs/pull/161739/files which links the schemas to their correct fhs locations and adds gsettings-desktop-schemas and hicolor-icon-theme to appimage fhs
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index c514ec22f11..18e36cb7028 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: +{ appimageTools, fetchurl, lib }: let pname = "Sylk"; @@ -15,7 +15,6 @@ appimageTools.wrapType2 rec { profile = '' export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; # no 32bit needed diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 66c507312c2..151649ba22e 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, wrapGAppsHook }: let pname = "lens"; @@ -20,10 +20,6 @@ in appimageTools.wrapType2 { inherit name src; - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 1a86a66fa29..b34e167e8c9 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: +{ lib, stdenv, appimageTools, fetchurl, undmg }: let pname = "octant-desktop"; @@ -25,7 +25,6 @@ let profile = '' export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; # no 32bit needed diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index aa0a8f7bfc4..d08e1cd1ba4 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -1,8 +1,6 @@ { lib , fetchurl , appimageTools -, gtk3 -, gsettings-desktop-schemas , xorg , pname , version @@ -24,7 +22,6 @@ in profile = '' export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index d4329ed09d3..b9b5175d3b8 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -1,6 +1,6 @@ { pname, version, src, meta, desktopName ? "Rambox" }: -{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "${pname}-${version}"; @@ -18,9 +18,6 @@ let }; in appimageTools.wrapType2 rec { inherit name src meta; - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index b0e53a054d2..9409a3c5fcd 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }: +{ appimageTools, fetchurl, lib }: let pname = "station"; @@ -18,7 +18,6 @@ in appimageTools.wrapType2 rec { profile = '' export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; |