From 0057a04a77e4d58adc7e37a907bdde893d29e070 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 15 Oct 2022 19:09:35 +0200 Subject: [PATCH] grandorgue: 0.3.1-r2333 -> 3.8.0-1 --- .../applications/audio/grandorgue/default.nix | 47 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index d0cff6c44fb6..74b845a01c7b 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,32 +1,57 @@ -{ lib, stdenv, fetchsvn, cmake, pkg-config, fftwFloat, alsa-lib -, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fftwFloat, alsa-lib +, zlib, wavpack, wxGTK32, udev, jackaudioSupport ? false, libjack2 +, imagemagick, libicns, makeWrapper, Cocoa , includeDemo ? true }: stdenv.mkDerivation rec { pname = "grandorgue"; - rev = "2333"; - version = "0.3.1-r${rev}"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/ourorgan/svn/trunk"; - inherit rev; - sha256 = "0xzjdc2g4gja2lpmn21xhdskv43qpbpzkbb05jfqv6ma2zwffzz1"; + version = "3.8.0-1"; + + src = fetchFromGitHub { + owner = "GrandOrgue"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-VXf2B5NK6lrcNXUiTTjYhfBVrTWusyadD+5ySkmelsI="; }; - nativeBuildInputs = [ cmake pkg-config ]; + postPatch = '' + substituteInPlace resources/CMakeLists.txt \ + --replace \ + "iconutil -c icns \''${GENERATED_ICONS_DIR}" \ + "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \ + ''; - buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] + nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; + + buildInputs = [ fftwFloat zlib wavpack wxGTK32 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ "-DRTAUDIO_USE_JACK=OFF" "-DRTMIDI_USE_JACK=OFF" + "-DGO_USE_JACK=OFF" + "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin,lib} + mv $out/GrandOrgue.app $out/Applications/ + for lib in $out/Applications/GrandOrgue.app/Contents/MacOS/lib*; do + ln -s $lib $out/lib/ + done + makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue + ''; + meta = { description = "Virtual Pipe Organ Software"; homepage = "https://sourceforge.net/projects/ourorgan"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8775a8e0da..33dcd841504d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28153,7 +28153,9 @@ with pkgs; }; }; - grandorgue = callPackage ../applications/audio/grandorgue { }; + grandorgue = callPackage ../applications/audio/grandorgue { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; greetd = recurseIntoAttrs { dlm = callPackage ../applications/display-managers/greetd/dlm.nix { };