diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index ee7960a843ba..fd2b3347afd0 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -1,5 +1,4 @@ { lib, appimageTools, fetchurl, makeDesktopItem -, gsettings-desktop-schemas, gtk3 }: let @@ -29,10 +28,6 @@ let in appimageTools.wrapType2 rec { 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 - ''; - multiPkgs = null; # no p32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index fa81414a7e72..e2e6bce72c41 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils -, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: +, fetchurl, libsecret }: let version = "3.11.1"; @@ -31,10 +31,6 @@ let in appimageTools.wrapType2 rec { 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 - ''; - extraPkgs = pkgs: with pkgs; [ libsecret ]; diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 058a0f656fb5..f97d44d1ea83 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }: +{ lib, appimageTools, fetchurl }: let pname = "chrysalis"; @@ -14,10 +14,6 @@ in appimageTools.wrapAppImage rec { }; }; - profile = '' - 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; extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 85298bc3c753..97ed9ed72962 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, appimageTools, fetchurl }: let version = "0.7.2"; @@ -17,10 +17,6 @@ let in appimageTools.wrapType2 rec { 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} install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index c842b7c4b36e..ecb553dbd660 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: +{ lib, stdenv, appimageTools, fetchurl, undmg }: let pname = "joplin-desktop"; @@ -45,7 +45,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/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index fc83e543dcfb..a99332ae82fd 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: +{ appimageTools, fetchurl, lib }: let pname = "marktext"; @@ -18,12 +18,6 @@ appimageTools.wrapType2 rec { profile = '' export LC_ALL=C.UTF-8 - '' - # Fixes file open dialog error - # GLib-GIO-ERROR **: 20:36:48.243: No GSettings schemas are installed on the system - # See https://github.com/NixOS/nixpkgs/pull/83701#issuecomment-608034097 - + '' - 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/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 923f5fb4528e..9e701cdb33f6 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: +{ appimageTools, fetchurl, lib }: let pname = "notable"; @@ -23,7 +23,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/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index d80c8d03bf43..21ac3a908d31 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,8 +1,6 @@ { appimageTools , lib , fetchurl -, gtk3 -, gsettings-desktop-schemas , texlive , pandoc }: @@ -23,10 +21,6 @@ in appimageTools.wrapType2 rec { 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 - ''; - multiPkgs = null; # no 32bit needed extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraInstallCommands = '' diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index c514ec22f110..18e36cb70280 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 66c507312c26..151649ba22ee 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 1a86a66fa29b..b34e167e8c94 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 aa0a8f7bfc46..d08e1cd1ba48 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 d4329ed09d35..b9b5175d3b87 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 b0e53a054d28..9409a3c5fcdd 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; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index aa591c225ad0..e038749f44ed 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -2,8 +2,6 @@ , fetchurl , appimageTools , libsecret -, gtk3 -, gsettings-desktop-schemas }: let diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index f23e88a323c2..d35720672846 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -1,6 +1,4 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 -, makeDesktopItem -}: +{ appimageTools, fetchurl, lib, makeDesktopItem }: let pname = "tusk"; @@ -31,7 +29,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; # no 32bit needed diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index d5791f6506cd..c88d0b9d3866 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }: +{ lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }: let pname = "radicle-upstream"; @@ -39,10 +39,6 @@ let linux = appimageTools.wrapType2 { 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 = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index e6be6f54e1dc..87518479db4b 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: +{ appimageTools, lib, fetchurl, version, sha256 }: let pname = "losslesscut"; @@ -21,7 +21,6 @@ in appimageTools.wrapType2 { 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 = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 19650671f125..c4ead0405937 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, appimageTools, fetchurl }: let pname = "altair"; @@ -14,10 +14,6 @@ in appimageTools.wrapType2 { inherit src pname version; - 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/${pname}-${version} $out/bin/${pname} diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 7478c27ce9f5..a0f1b097a98a 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: +{ lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; version = "2.3.52"; @@ -31,10 +31,6 @@ appimageTools.wrapType2 { cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png ''; - profile = '' - export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}''${XDG_DATA_DIRS:+:"''$XDG_DATA_DIRS"}" - ''; - extraPkgs = pkgs: with pkgs; [ wget unzip diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index e52c38822160..4a6ca92e964b 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools }: appimageTools.wrapType2 rec { pname = "unityhub"; @@ -31,10 +31,6 @@ appimageTools.wrapType2 rec { $out/share/icons/hicolor/64x64/apps/unityhub.png ''; - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - meta = with lib; { homepage = "https://unity3d.com/"; description = "Game development tool"; diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 1c9ed7c2e10e..59ab32131c2d 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }: +{ lib, fetchurl, appimageTools }: let pname = "bloomrpc"; @@ -19,7 +19,6 @@ appimageTools.wrapType2 { 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/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 565bb87f7e01..044d159cde1d 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools }: let pname = "heroic"; @@ -29,10 +29,6 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=heroic' ''; - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - meta = with lib; { description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index a79f414a3591..cb3eeca27af8 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -1,8 +1,6 @@ { appimageTools , fetchurl , lib -, gsettings-desktop-schemas -, gtk3 , libxkbfile , udev , wooting-udev-rules @@ -21,7 +19,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 = extraPkgs;