Merge pull request #253685 from steveej-forks/pr_holochain-launcher
holochain-launcher: bump 0.9 -> beta-2 0.11; fix devtools and TLS
This commit is contained in:
commit
2be8b505c4
|
@ -8,15 +8,18 @@
|
|||
, webkitgtk
|
||||
, libappindicator
|
||||
, wrapGAppsHook
|
||||
, shared-mime-info
|
||||
, glib-networking
|
||||
}:
|
||||
|
||||
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 = [
|
||||
|
@ -29,16 +32,25 @@ stdenv.mkDerivation rec {
|
|||
openssl
|
||||
webkitgtk
|
||||
libappindicator
|
||||
|
||||
glib-networking
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
mv usr $out
|
||||
mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher
|
||||
'';
|
||||
|
||||
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"
|
||||
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue