diff options
author | Artturi <Artturin@artturin.com> | 2022-04-01 12:27:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-01 12:27:24 +0300 |
commit | 18f19c2bb896bdcc405f912216530f58e5ac92be (patch) | |
tree | a0e55a4cbfc33a7e52756894bd09ff5214e5dd2d /pkgs/applications | |
parent | db5e4dbdd5f0dddf9a395a5050542791b3cb2ae7 (diff) | |
parent | 58b6768280c56df995bcddfbf776126c951a3778 (diff) | |
download | nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar.gz nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar.bz2 nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar.lz nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar.xz nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.tar.zst nixlib-18f19c2bb896bdcc405f912216530f58e5ac92be.zip |
Merge pull request #166275 from gador/pinegrow-fix-gsettings
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/pinegrow/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 1f069024eb9e..dfcf8e4f787c 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -8,6 +8,7 @@ , autoPatchelfHook , gsettings-desktop-schemas , gtk3 +, wrapGAppsHook , makeWrapper }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { unzip autoPatchelfHook makeWrapper + wrapGAppsHook ]; buildInputs = [ @@ -34,7 +36,8 @@ stdenv.mkDerivation rec { gtk3 ]; - wrapProgramFlags = [ + dontWrapGApps = true; + makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" ]; @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { # we can't unzip it in $out/lib, because nw.js will start with # an empty screen. Therefore it will be unzipped in a non-typical # folder and symlinked. - unzip $src -d $out/opt/pinegrow + unzip -q $src -d $out/opt/pinegrow substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \ --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"' mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop @@ -60,9 +63,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # GSETTINGS_SCHEMAS_PATH is not set in installPhase preFixup = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - wrapProgram "$out/opt/pinegrow/PinegrowLibrary" ''${wrapProgramFlags[@]} + wrapProgram $out/bin/Pinegrow \ + ''${makeWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} ''; meta = with lib; { |