diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/applications/audio/grandorgue | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/applications/audio/grandorgue')
-rw-r--r-- | pkgs/applications/audio/grandorgue/default.nix | 47 |
1 files changed, 36 insertions, 11 deletions
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index d0e5ba53c1ce0..33c64e079460a 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" \ + ''; + + nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; - buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] + buildInputs = [ fftwFloat zlib wavpack wxGTK32 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optionals (!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 ]; }; } |