diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-03 07:02:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 07:02:57 +0100 |
| commit | c1bddbe5a135be997eb8a78471067199911ec5d5 (patch) | |
| tree | d243de9aeefe29b603b4a9636b2f66e15f290d54 | |
| parent | Merge pull request #126738 from NixOS/backport-126060-to-release-21.05 (diff) | |
| parent | tlaToolbox: fix crash on file open dialog (diff) | |
| download | nixpkgs-c1bddbe5a135be997eb8a78471067199911ec5d5.tar.gz | |
Merge pull request #129077 from NixOS/backport-129042-to-release-21.05
[Backport release-21.05] tlaToolbox: fix crash on file open dialog
| -rw-r--r-- | pkgs/applications/science/logic/tlaplus/toolbox.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index defe218b119e..ef2d97ef6bfc 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,5 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib, wrapGAppsHook }: let @@ -25,7 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; phases = [ "installPhase" ]; @@ -36,6 +40,9 @@ in stdenv.mkDerivation rec { cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" + fixupPhase + gappsWrapperArgsHook + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" @@ -52,7 +59,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ + "''${gappsWrapperArgs[@]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" |