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

Merge pull request #173084 from Artturin/unecessaryprf

Browse Source 
treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
This commit is contained in:
Artturi 2022-05-18 21:23:58 +03:00 committed by GitHub
commit b0c602515d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 19 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/blockchains/mycrypto/default.nix
View File

@ -1,5 +1,4 @@
{ lib, appimageTools, fetchurl, makeDesktopItem { lib, appimageTools, fetchurl, makeDesktopItem
, gsettings-desktop-schemas, gtk3
}: }:
let let
@ -29,10 +28,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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 multiPkgs = null; # no p32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

6
pkgs/applications/editors/standardnotes/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: , fetchurl, libsecret }:
let let
version = "3.11.1"; version = "3.11.1";
@ -31,10 +31,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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; [ extraPkgs = pkgs: with pkgs; [
libsecret libsecret
]; ];

6
pkgs/applications/misc/chrysalis/default.nix
View File

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }: { lib, appimageTools, fetchurl }:
let let
pname = "chrysalis"; 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; multiPkgs = null;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.glib p.glib

6
pkgs/applications/misc/devdocs-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: { lib, appimageTools, fetchurl }:
let let
version = "0.7.2"; version = "0.7.2";
@ -17,10 +17,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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 = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop

3
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: { lib, stdenv, appimageTools, fetchurl, undmg }:
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
@ -45,7 +45,6 @@ let
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

8
pkgs/applications/misc/marktext/default.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "marktext"; pname = "marktext";
@ -18,12 +18,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

3
pkgs/applications/misc/notable/default.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "notable"; pname = "notable";
@ -23,7 +23,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

6
pkgs/applications/misc/zettlr/default.nix
View File

@ -1,8 +1,6 @@
{ appimageTools { appimageTools
, lib , lib
, fetchurl , fetchurl
, gtk3
, gsettings-desktop-schemas
, texlive , texlive
, pandoc , pandoc
}: }:
@ -23,10 +21,6 @@ in
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
inherit name src; 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 multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = '' extraInstallCommands = ''

3
pkgs/applications/networking/Sylk/default.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "Sylk"; pname = "Sylk";
@ -15,7 +15,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

6
pkgs/applications/networking/cluster/lens/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: { lib, fetchurl, appimageTools, wrapGAppsHook }:
let let
pname = "lens"; pname = "lens";
@ -20,10 +20,6 @@ in
appimageTools.wrapType2 { appimageTools.wrapType2 {
inherit name src; 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 = extraInstallCommands =
'' ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}

3
pkgs/applications/networking/cluster/octant/desktop.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: { lib, stdenv, appimageTools, fetchurl, undmg }:
let let
pname = "octant-desktop"; pname = "octant-desktop";
@ -25,7 +25,6 @@ let
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

3
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
View File

@ -1,8 +1,6 @@
{ lib { lib
, fetchurl , fetchurl
, appimageTools , appimageTools
, gtk3
, gsettings-desktop-schemas
, xorg , xorg
, pname , pname
, version , version
@ -24,7 +22,6 @@ in
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;

5
pkgs/applications/networking/instant-messengers/rambox/rambox.nix
View File

@ -1,6 +1,6 @@
{ pname, version, src, meta, desktopName ? "Rambox" }: { pname, version, src, meta, desktopName ? "Rambox" }:
{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }: { appimageTools, lib, fetchurl, makeDesktopItem }:
let let
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -18,9 +18,6 @@ let
}; };
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src meta; 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 = '' extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps

3
pkgs/applications/networking/station/default.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }: { appimageTools, fetchurl, lib }:
let let
pname = "station"; pname = "station";
@ -18,7 +18,6 @@ in appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; multiPkgs = null;

2
pkgs/applications/office/timeular/default.nix
View File

@ -2,8 +2,6 @@
, fetchurl , fetchurl
, appimageTools , appimageTools
, libsecret , libsecret
, gtk3
, gsettings-desktop-schemas
}: }:
let let

5
pkgs/applications/office/tusk/default.nix
View File

@ -1,6 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 { appimageTools, fetchurl, lib, makeDesktopItem }:
, makeDesktopItem
}:
let let
pname = "tusk"; pname = "tusk";
@ -31,7 +29,6 @@ in appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

6
pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }: { lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }:
let let
pname = "radicle-upstream"; pname = "radicle-upstream";
@ -39,10 +39,6 @@ let
linux = appimageTools.wrapType2 { linux = appimageTools.wrapType2 {
inherit name src meta; 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 = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}

3
pkgs/applications/video/losslesscut-bin/appimage.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: { appimageTools, lib, fetchurl, version, sha256 }:
let let
pname = "losslesscut"; pname = "losslesscut";
@ -21,7 +21,6 @@ in appimageTools.wrapType2 {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;

6
pkgs/development/tools/altair-graphql-client/default.nix
View File

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: { lib, appimageTools, fetchurl }:
let let
pname = "altair"; pname = "altair";
@ -14,10 +14,6 @@ in
appimageTools.wrapType2 { appimageTools.wrapType2 {
inherit src pname version; 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 = '' extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname} mv $out/bin/${pname}-${version} $out/bin/${pname}

6
pkgs/development/tools/misc/saleae-logic-2/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: { lib, fetchurl, makeDesktopItem, appimageTools }:
let let
name = "saleae-logic-2"; name = "saleae-logic-2";
version = "2.3.52"; 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 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; [ extraPkgs = pkgs: with pkgs; [
wget wget
unzip unzip

6
pkgs/development/tools/unityhub/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: { lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
pname = "unityhub"; pname = "unityhub";
@ -31,10 +31,6 @@ appimageTools.wrapType2 rec {
$out/share/icons/hicolor/64x64/apps/unityhub.png $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; { meta = with lib; {
homepage = "https://unity3d.com/"; homepage = "https://unity3d.com/";
description = "Game development tool"; description = "Game development tool";

3
pkgs/development/web/bloomrpc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }: { lib, fetchurl, appimageTools }:
let let
pname = "bloomrpc"; pname = "bloomrpc";
@ -19,7 +19,6 @@ appimageTools.wrapType2 {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

6
pkgs/games/heroic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: { lib, fetchurl, appimageTools }:
let let
pname = "heroic"; pname = "heroic";
@ -29,10 +29,6 @@ appimageTools.wrapType2 {
--replace 'Exec=AppRun' 'Exec=heroic' --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; { meta = with lib; {
description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac"; description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";

3
pkgs/tools/misc/wootility/default.nix
View File

@ -1,8 +1,6 @@
{ appimageTools { appimageTools
, fetchurl , fetchurl
, lib , lib
, gsettings-desktop-schemas
, gtk3
, libxkbfile , libxkbfile
, udev , udev
, wooting-udev-rules , wooting-udev-rules
@ -21,7 +19,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; multiPkgs = extraPkgs;