git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #133328 from angustrau/portmidi

portmidi: add support for darwin

commitc1a06ee07fa5d28aec04922dff076fe9b4247e68 authorSandro <sandro.jaeckel@gmail.com> dateTue 10 Aug 2021, 15:15 (5 years ago) parent56519d9f29b9da
3 files changed+90−14
pkgs/development/libraries/portmidi/default.nix+35−13 pkgs/development/libraries/portmidi/remove-darwin-variables.diff+52 pkgs/top-level/all-packages.nix+3−1
pkgs/development/libraries/portmidi/default.nix+35−13
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib }:
1+{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }:
22
33stdenv.mkDerivation rec {
44 pname = "portmidi";
@@ -20,14 +20,31 @@ stdenv.mkDerivation rec {
2020 "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release"
2121 "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release"
2222 "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release"
23+ ] ++ lib.optionals stdenv.isDarwin [
24+ "-DCMAKE_OSX_ARCHITECTURES=${if stdenv.isAarch64 then "arm64" else "x86_64"}"
25+ "-DCOREAUDIO_LIB=${CoreAudio}"
26+ "-DCOREFOUNDATION_LIB=${CoreFoundation}"
27+ "-DCOREMIDI_LIB=${CoreMIDI}"
28+ "-DCORESERVICES_LIB=${CoreServices}"
2329 ];
2430
25− # XXX: This is to deactivate Java support.
26− patches = lib.singleton (fetchurl {
27− url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/"
28− + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
29− sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
30− });
31+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [
32+ "-framework CoreAudio"
33+ "-framework CoreFoundation"
34+ "-framework CoreMIDI"
35+ "-framework CoreServices"
36+ ];
37+
38+ patches = [
39+ # XXX: This is to deactivate Java support.
40+ (fetchurl {
41+ url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
42+ sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
43+ })
44+ ] ++ lib.optionals stdenv.isDarwin [
45+ # Remove hardcoded variables so we can set them properly
46+ ./remove-darwin-variables.diff
47+ ];
3148
3249 postPatch = ''
3350 sed -i -e 's|/usr/local/|'"$out"'|' -e 's|/usr/share/|'"$out"'/share/|' \
@@ -40,19 +57,24 @@ stdenv.mkDerivation rec {
4057 pm_java/CMakeLists.txt
4158 '';
4259
43− postInstall = ''
44− ln -s libportmidi.so "$out/lib/libporttime.so"
60+ postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
61+ ln -s libportmidi.${ext} "$out/lib/libporttime.${ext}"
4562 '';
4663
4764 nativeBuildInputs = [ unzip cmake ];
48− buildInputs = [ alsa-lib ];
65+ buildInputs = lib.optionals stdenv.isLinux [
66+ alsa-lib
67+ ] ++ lib.optionals stdenv.isDarwin [
68+ Carbon CoreAudio CoreFoundation CoreMIDI CoreServices
69+ ];
4970
5071 hardeningDisable = [ "format" ];
5172
52− meta = {
73+ meta = with lib; {
5374 homepage = "http://portmedia.sourceforge.net/portmidi/";
5475 description = "Platform independent library for MIDI I/O";
55− license = lib.licenses.mit;
56− platforms = lib.platforms.linux;
76+ license = licenses.mit;
77+ maintainers = with maintainers; [ angustrau ];
78+ platforms = platforms.unix;
5779 };
5880}
pkgs/development/libraries/portmidi/remove-darwin-variables.diffnew file+52
@@ -0,0 +1,52 @@
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2+index 4919b78..758eccb 100644
3+--- a/CMakeLists.txt
4++++ b/CMakeLists.txt
5+@@ -36,8 +36,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
6+ set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
7+ set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
8+
9+-set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE)
10+-
11+ PROJECT(portmidi)
12+
13+ if(UNIX)
14+diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
15+index e171047..aafa09c 100644
16+--- a/pm_common/CMakeLists.txt
17++++ b/pm_common/CMakeLists.txt
18+@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
19+ endif(APPLE OR WIN32)
20+
21+ if(APPLE)
22+- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk CACHE
23++ set(CMAKE_OSX_SYSROOT / CACHE
24+ PATH "-isysroot parameter for compiler" FORCE)
25+ set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE
26+ STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
27+@@ -54,10 +54,6 @@ if(UNIX)
28+
29+ include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon)
30+ set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks)
31+- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework")
32+- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework")
33+- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework")
34+- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework")
35+ set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB}
36+ ${COREMIDI_LIB} ${CORESERVICES_LIB}
37+ CACHE INTERNAL "")
38+diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
39+index f693dd6..1dc5cd6 100644
40+--- a/pm_dylib/CMakeLists.txt
41++++ b/pm_dylib/CMakeLists.txt
42+@@ -49,10 +49,6 @@ if(UNIX)
43+
44+ include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon)
45+ set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks)
46+- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework")
47+- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework")
48+- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework")
49+- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework")
50+ set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB}
51+ ${COREMIDI_LIB} ${CORESERVICES_LIB}
52+ CACHE INTERNAL "")
pkgs/top-level/all-packages.nix+3−1
@@ -18135,7 +18135,9 @@ with pkgs;
1813518135 };
1813618136 });
1813718137
18138− portmidi = callPackage ../development/libraries/portmidi {};
18138+ portmidi = callPackage ../development/libraries/portmidi {
18139+ inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices;
18140+ };
1813918141
1814018142 presage = callPackage ../development/libraries/presage { };
1814118143