From 632165b83dc576272d01249e308aeacc6f00f34a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 12 Jul 2023 09:51:07 +0200 Subject: [PATCH 1/2] famistudio: 4.0.6 -> 4.1.0 --- .../applications/audio/famistudio/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 81a2646ad74a..abd829a4a9ce 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -2,31 +2,33 @@ , stdenv , fetchzip , autoPatchelfHook -, makeWrapper -, mono -, openal +, dotnet-runtime , libGL +, makeWrapper +, openal }: stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.0.6"; + version = "4.1.0"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4="; + hash = "sha256-NLlOmoaYg7cExYFpzo/JnlhKm/AIBOJl4LrhYgqCI6c="; }; + strictDeps = true; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ - mono - openal + dotnet-runtime libGL + openal ]; dontConfigure = true; @@ -38,8 +40,8 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/famistudio} mv * $out/lib/famistudio - makeWrapper ${mono}/bin/mono $out/bin/famistudio \ - --add-flags $out/lib/famistudio/FamiStudio.exe \ + makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ + --add-flags $out/lib/famistudio/FamiStudio.dll \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} # Bundled openal lib freezes the application From 99a726ba3ca33f7e7d79010b86e4b84d8e240e98 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 22 Jul 2023 13:54:27 +0200 Subject: [PATCH 2/2] famistudio: 4.1.0 -> 4.1.1 --- pkgs/applications/audio/famistudio/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index abd829a4a9ce..89d684523755 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -3,19 +3,20 @@ , fetchzip , autoPatchelfHook , dotnet-runtime -, libGL +, ffmpeg +, libglvnd , makeWrapper , openal }: stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.1.0"; + version = "4.1.1"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - hash = "sha256-NLlOmoaYg7cExYFpzo/JnlhKm/AIBOJl4LrhYgqCI6c="; + hash = "sha256-fRNjboCfymBhr7Eg5ENnO1fchX0oTdeaJJ0SC3BKTVI="; }; strictDeps = true; @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ dotnet-runtime - libGL + ffmpeg + libglvnd openal ]; @@ -42,7 +44,8 @@ stdenv.mkDerivation rec { makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ --add-flags $out/lib/famistudio/FamiStudio.dll \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} # Bundled openal lib freezes the application rm $out/lib/famistudio/libopenal32.so