From cda702855f81e8d544ee5346a8d3c525e681a470 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 31 Dec 2025 14:00:31 +0100 Subject: [PATCH] bonzomatic: modernize --- pkgs/by-name/bo/bonzomatic/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix index ec3024b8cf8f..e1ee65d74f21 100644 --- a/pkgs/by-name/bo/bonzomatic/package.nix +++ b/pkgs/by-name/bo/bonzomatic/package.nix @@ -10,18 +10,20 @@ libXcursor, libXinerama, libXrandr, - xorg, + xinput, + libXi, + libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bonzomatic"; version = "2023-06-15"; src = fetchFromGitHub { owner = "Gargaj"; repo = "bonzomatic"; - tag = version; - sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg="; + tag = finalAttrs.version; + hash = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg="; }; postPatch = '' @@ -33,6 +35,7 @@ stdenv.mkDerivation rec { cmake makeWrapper ]; + buildInputs = [ alsa-lib fontconfig @@ -40,13 +43,14 @@ stdenv.mkDerivation rec { libXcursor libXinerama libXrandr - xorg.xinput - xorg.libXi - xorg.libXext + xinput + libXi + libXext ]; postFixup = '' - wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsa-lib}/lib" + wrapProgram $out/bin/bonzomatic \ + --prefix LD_LIBRARY_PATH : "${lib.getLib alsa-lib}/lib" ''; meta = { @@ -60,4 +64,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "bonzomatic"; }; -} +})