From 0e1d8e94b0ce934457d515bfec3666cf486efb8d Mon Sep 17 00:00:00 2001 From: Raf Gemmail Date: Sun, 25 May 2025 13:14:50 +1200 Subject: [PATCH 1/2] matrix-brandy: 1.23.3 -> 1.23.5, add updateScript --- pkgs/by-name/ma/matrix-brandy/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index bf9d518783c3..de9247c2fa20 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -3,18 +3,19 @@ stdenv, fetchFromGitHub, libX11, + nix-update-script, SDL, }: stdenv.mkDerivation rec { pname = "matrix-brandy"; - version = "1.23.3"; + version = "1.23.5"; src = fetchFromGitHub { owner = "stardot"; repo = "MatrixBrandy"; rev = "V${version}"; - hash = "sha256-jw5SxCQ2flvCjO/JO3BHpnpt31wBsBxDkVH7uwVxTS0="; + hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8="; }; buildInputs = [ @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { cp brandy $out/bin ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "http://brandy.matrixnetwork.co.uk/"; description = "Matrix Brandy BASIC VI for Linux, Windows, MacOSX"; From 0b4d19ccdded19dbde2a8a36251b184157d1e37c Mon Sep 17 00:00:00 2001 From: Raf Gemmail Date: Sun, 25 May 2025 13:17:20 +1200 Subject: [PATCH 2/2] matrix-brandy: add darwin support --- pkgs/by-name/ma/matrix-brandy/no-lrt.patch | 13 +++++++++++++ pkgs/by-name/ma/matrix-brandy/package.nix | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ma/matrix-brandy/no-lrt.patch diff --git a/pkgs/by-name/ma/matrix-brandy/no-lrt.patch b/pkgs/by-name/ma/matrix-brandy/no-lrt.patch new file mode 100644 index 000000000000..7f42553852a9 --- /dev/null +++ b/pkgs/by-name/ma/matrix-brandy/no-lrt.patch @@ -0,0 +1,13 @@ +diff --git a/makefile b/makefile +index d89cee1..37c1ac5 100644 +--- a/makefile ++++ b/makefile +@@ -13,7 +13,7 @@ CFLAGS = -O3 -fPIE $(shell sdl-config --cflags) -DUSE_SDL -DDEFAULT_IGNORE -Wall + + LDFLAGS += + +-LIBS = -lm $(shell sdl-config --libs) -ldl -pthread -lrt -lX11 ++LIBS = -lm $(shell sdl-config --libs) -ldl -pthread -lX11 + + SRCDIR = src + diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index de9247c2fa20..2adc72a2e897 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8="; }; + patches = lib.optionals stdenv.isDarwin [ ./no-lrt.patch ]; + + makeFlags = lib.optionals stdenv.isDarwin [ + "CC=cc" + "LD=clang" + ]; + buildInputs = [ libX11 SDL @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { description = "Matrix Brandy BASIC VI for Linux, Windows, MacOSX"; mainProgram = "brandy"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fiq ]; }; }