diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix index ef6fa1cd71e7..63619e92bbfe 100644 --- a/pkgs/by-name/bi/biglybt/package.nix +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + swt, fetchurl, jre, wrapGAppsHook3, @@ -16,7 +17,18 @@ stdenv.mkDerivation rec { hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; + nativeBuildInputs = [ + swt + wrapGAppsHook3 + ]; + + buildInputs = [ + swt + ]; + + runtimeDeps = [ + swt + ]; configurePhase = '' runHook preConfigure @@ -34,6 +46,11 @@ stdenv.mkDerivation rec { cp -r ./* $out/share/biglybt/ + ln -s ${swt}/lib/* $out/share/biglybt/ + rm -rf $out/share/biglybt/swt/*.jar $out/share/biglybt/swt/J17/*.jar + ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/swt-$(uname -m).jar + ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/J17/swt-$(uname -m).jar + ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/ ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/ diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 75b6c994da35..da7139ae86b1 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -17,10 +17,21 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; passthru.srcMetadataByPlatform = { + # Note: This may look like an error but the content of the src.zip is in fact + # equal on all linux systems as well as all darwin systems. Even though each + # of these zip archives themselves contains a different hash. x86_64-linux.platform = "gtk-linux-x86_64"; x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + aarch64-linux.platform = "gtk-linux-aarch64"; + aarch64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + ppc64le-linux.platform = "gtk-linux-ppc64le"; + ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + riscv64-linux.platform = "gtk-linux-riscv64"; + riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI="; + aarch64-darwin.platform = "cocoa-macosx-aarch64"; + aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI"; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;