Merge pull request #173084 from Artturin/unecessaryprf
treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
This commit is contained in:
commit
b0c602515d
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
];
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
, fetchurl
|
||||
, appimageTools
|
||||
, libsecret
|
||||
, gtk3
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue