From 596580748fd187da454521ed0aa75c68ea479694 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 3 Apr 2022 02:37:05 +0000 Subject: [PATCH] =?UTF-8?q?squeak:=206.0alpha-21485-=E2=80=A6=20->=206.0al?= =?UTF-8?q?pha-21540-=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add 32bit build as well. --- squeak/default.nix | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/squeak/default.nix b/squeak/default.nix index f275f47..6321109 100644 --- a/squeak/default.nix +++ b/squeak/default.nix @@ -3,17 +3,32 @@ let versionA = "6.0alpha"; - versionB = "21485"; + versionB = "21540"; versionC = "202112201228"; + bits = with stdenv.hostPlatform; + if is32bit then + "32" + else if is64bit then + "64" + else + throw "too many addressing bits"; + sources = { + i686-linux = fetchurl { + url = + "http://files.squeak.org/trunk/Squeak${versionA}-${versionB}-32bit/Squeak${versionA}-${versionB}-${bits}bit-${versionC}-Linux-x86.tar.gz"; + sha256 = "sha256-41xQyY6lR4E87rFx8wT7NBSQJOktNCuRjTJ1Og1wGOk="; + }; + x86_64-linux = fetchurl { + url = + "http://files.squeak.org/trunk/Squeak${versionA}-${versionB}-${bits}bit/Squeak${versionA}-${versionB}-${bits}bit-${versionC}-Linux-x64.tar.gz"; + sha256 = "sha256-1h8WP2GCzRg/aHxmzDj24Y2HH4IsXUA4O4dB7WNGD9E="; + }; + }; in stdenv.mkDerivation rec { pname = "squeak"; version = "${versionA}-${versionB}-${versionC}"; - src = fetchurl { - url = - "http://files.squeak.org/trunk/Squeak${versionA}-${versionB}-64bit/Squeak${versionA}-${versionB}-64bit-${versionC}-Linux-x64.tar.gz"; - sha256 = "sha256-4E32VJaZyQlE71Z98woiMX5shbaj6/cS0i7uloABANU="; - }; + src = sources.${stdenv.system}; nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; @@ -42,7 +57,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "$out/lib:${ lib.makeLibraryPath [ openssl ] }" \ - --set SQUEAK_IMAGE $out/lib/Squeak${versionA}-${versionB}-64bit.image + --set SQUEAK_IMAGE $out/lib/Squeak${versionA}-${versionB}-${bits}bit.image ''; preFixup = '' @@ -54,6 +69,6 @@ in stdenv.mkDerivation rec { homepage = "https://squeak.org/"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ ehmry ]; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames sources; }; }