From 134f4d0a9a4badc2155bd9232e1217d6e0582de1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 10 Jul 2023 10:17:16 +0200 Subject: [PATCH] wildmidi: Enable on Darwin, refactor config - enable on Darwin (uses OpenAL framework there) - refactor default config - use WriteTextFile and symlink instead of echoing together - set WILDMIDI_CFG cmake variable instead of patching its default value - correct config location - default (and now explicitly-set) location is actually /etc/wildmidi/wildmidi.cfg --- .../libraries/wildmidi/default.nix | 34 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 8877365e1dd..23dc8dc3b05 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, freepats }: +{ lib, stdenv, fetchFromGitHub, writeTextFile, cmake, alsa-lib, OpenAL, freepats }: +let + defaultCfgPath = "${placeholder "out"}/etc/wildmidi/wildmidi.cfg"; +in stdenv.mkDerivation rec { pname = "wildmidi"; version = "0.4.5"; @@ -13,21 +16,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ]; + buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ + alsa-lib stdenv.cc.libc/*couldn't find libm*/ + ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ + OpenAL + ]; preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /etc/wildmidi $out/etc # https://github.com/Mindwerks/wildmidi/issues/236 substituteInPlace src/wildmidi.pc.in \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; - postInstall = '' - mkdir "$out"/etc - echo "dir ${freepats}" > "$out"/etc/wildmidi.cfg - echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg + cmakeFlags = [ + "-DWILDMIDI_CFG=${defaultCfgPath}" + ]; + + postInstall = let + defaultCfg = writeTextFile { + name = "wildmidi.cfg"; + text = '' + dir ${freepats} + source ${freepats}/freepats.cfg + ''; + }; + in '' + mkdir -p "$(dirname ${defaultCfgPath})" + ln -s ${defaultCfg} ${defaultCfgPath} ''; meta = with lib; { @@ -39,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75f7c262c4d..82c0b0baca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25059,7 +25059,9 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; - wildmidi = callPackage ../development/libraries/wildmidi { }; + wildmidi = callPackage ../development/libraries/wildmidi { + inherit (darwin.apple_sdk.frameworks) OpenAL; + }; wiredtiger = callPackage ../development/libraries/wiredtiger { };