From 542ace3e66c44494d0e9629483fabeeceea55e2c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 12 Jul 2023 18:07:46 +0200 Subject: [PATCH 1/3] holochain-launcher: 0.9.0 -> beta-2 0.11.0 --- pkgs/applications/misc/holochain-launcher/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 38965da9db1e..fe099d06cd3c 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,12 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.4"; + version = "0.11.0"; + prerelease = "beta-2"; src = fetchurl { - url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-qTzm4pwhYbEN96a/Dz/JcJcZ2OobyQJRNC2yH4CbhzQ="; + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher-${prerelease}_${version}_amd64.deb"; + sha256 = "sha256-yxovSsPyIzFONa1ACeLkZqDCElDI3uTm81YOYW0/FXE="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out + mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher ''; preFixup = '' From 0f94ac780f0a72a92fa2b8d95cf78d8421cf52a2 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 6 Sep 2023 20:58:16 +0200 Subject: [PATCH 2/3] holochain-launcher: fix devtools and TLS - setting XDG_DATA_DIRS fixes the devtools - glib-networking fixes TLS --- pkgs/applications/misc/holochain-launcher/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index fe099d06cd3c..6d9697914cbd 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -8,6 +8,8 @@ , webkitgtk , libappindicator , wrapGAppsHook +, shared-mime-info +, glib-networking }: stdenv.mkDerivation rec { @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { openssl webkitgtk libappindicator + + glib-networking ]; unpackCmd = "dpkg-deb -x $curSrc source"; @@ -41,6 +45,11 @@ stdenv.mkDerivation rec { preFixup = '' patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + + # without this the DevTools will just display an unparsed HTML file (see https://github.com/tauri-apps/tauri/issues/5711#issuecomment-1336409601) + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) ''; meta = with lib; { From d78e1e1db197bd06418581044006b80a941ae4b8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 6 Sep 2023 21:21:46 +0200 Subject: [PATCH 3/3] holochain-launcher: workaround webkit issue this workaround was required when testing on a non-nixos system --- pkgs/applications/misc/holochain-launcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 6d9697914cbd..f2be253e3fac 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { # without this the DevTools will just display an unparsed HTML file (see https://github.com/tauri-apps/tauri/issues/5711#issuecomment-1336409601) gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ) '';