diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/chrysalis/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/devdocs-desktop/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/marktext/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/notable/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/zettlr/default.nix | 6 |
6 files changed, 5 insertions, 27 deletions
diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 058a0f656fb55..f97d44d1ea835 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 85298bc3c7534..97ed9ed72962e 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 c842b7c4b36eb..ecb553dbd660b 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 fc83e543dcfba..a99332ae82fde 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 923f5fb4528ee..9e701cdb33f6b 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 d80c8d03bf43b..21ac3a908d317 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 = '' |