From 6db348ad34005efce96567082717ccc0756f2675 Mon Sep 17 00:00:00 2001 From: sempiternal-aurora <78790545+sempiternal-aurora@users.noreply.github.com> Date: Mon, 19 Jan 2026 23:40:24 +0800 Subject: [PATCH] isabelle: fixup and make vscode work Replace the electron binary and remove unused libs, and fixes the platforms. --- pkgs/by-name/is/isabelle/package.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c0c9d040127a..1a4fef548cc9 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -19,6 +19,7 @@ isabelle-components, symlinkJoin, fetchhg, + electron, }: let @@ -192,10 +193,15 @@ stdenv.mkDerivation (finalAttrs: { arch=${ if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system } - for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do + for f in contrib/*/$arch/{z3,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"} done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process + + ln -sf ${electron}/bin/electron contrib/vscodium-*/*/electron + rm contrib/vscodium-*/*/*.so{,.*} + rm contrib/vscodium-*/*/chrome* + for d in contrib/kodkodi-*/jni/$arch; do patchelf --set-rpath "${ lib.concatStringsSep ":" [ @@ -279,7 +285,12 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.jvanbruegge ]; - platforms = lib.platforms.unix; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; passthru.withComponents =