From 37cc3ead1b673ef44517b588c832ddd0fe9246f4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 25 Aug 2022 14:22:00 +0200 Subject: [PATCH] famistudio: 3.3.1 -> 4.0.1 --- .../applications/audio/famistudio/default.nix | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 002ddd78abb8..b90bc3f13341 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -3,27 +3,31 @@ , fetchzip , autoPatchelfHook , makeWrapper -, alsa-lib -, gtk-sharp-2_0 -, glib -, gtk2 , mono , openal +, libGL }: stdenv.mkDerivation rec { pname = "famistudio"; - version = "3.3.1"; + version = "4.0.1"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-Bgry+cRsmC+aBff6EaeHoGBygpiZS5SmgICPU32zO+c="; + sha256 = "sha256-pAULW2aIaKiA61rARpL+hSoffnQO6hfqVpOcEMwD7oo="; }; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; - buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ]; + buildInputs = [ + mono + openal + libGL + ]; dontConfigure = true; dontBuild = true; @@ -36,16 +40,11 @@ stdenv.mkDerivation rec { makeWrapper ${mono}/bin/mono $out/bin/famistudio \ --add-flags $out/lib/famistudio/FamiStudio.exe \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} - # Fails to find openal32.dll on its own, needs abit of help + # Bundled openal lib freezes the application rm $out/lib/famistudio/libopenal32.so - cat <$out/lib/famistudio/OpenTK.dll.config - - - - EOF + ln -s ${openal}/lib/libopenal.so $out/lib/famistudio/libopenal32.so runHook postInstall '';