diff options
| author | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
|---|---|---|
| committer | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
| commit | 705afbd338e26b486aaacc237ee4fffbf9759b21 (patch) | |
| tree | 5c69ce5ff8d77f023b12dcbea6b6d3a4d68e982b /pkgs/applications/science/logic/tlaplus/toolbox.nix | |
| parent | c99a5b9a60ae5c5204a3f41f5d65b642093d1b82 (diff) | |
| parent | 94982e6f874ec52eaf3fed29c8d229cdc1f8bc2c (diff) | |
| download | nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.gz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.bz2 nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.lz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.xz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.zst nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.zip | |
Merge branch 'master' into package-petsc-p4est
Diffstat (limited to 'pkgs/applications/science/logic/tlaplus/toolbox.nix')
| -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 defe218b119..ef2d97ef6bf 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" |