b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #133485 from angustrau/portmidi-r234

Browse source
This commit is contained in:
Sandro 2021-08-12 01:52:45 +02:00 committed by GitHub
parent b003277d29 677f1be589
commit 17b4b7097f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/portmidi/default.nix
View file

@ -2,13 +2,17 @@
stdenv.mkDerivation rec {
pname = "portmidi";
version = "217";
version = "234";
src = fetchurl {
url = "mirror://sourceforge/portmedia/portmidi-src-${version}.zip";
sha256 = "03rfsk7z6rdahq2ihy5k13qjzgx757f75yqka88v3gc0pn9ais88";
url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
};
prePatch = ''
cd portmidi/trunk
'';
cmakeFlags = let
#base = "${jdk}/jre/lib/${jdk.architecture}";
in [

8
pkgs/development/libraries/portmidi/remove-darwin-variables.diff
View file

@ -12,17 +12,17 @@ index 4919b78..758eccb 100644
if(UNIX)
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
index e171047..aafa09c 100644
index cbeeade..f765430 100644
--- a/pm_common/CMakeLists.txt
+++ b/pm_common/CMakeLists.txt
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
endif(APPLE OR WIN32)
if(APPLE)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk CACHE
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE
+ set(CMAKE_OSX_SYSROOT / CACHE
PATH "-isysroot parameter for compiler" FORCE)
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE
PATH "-isysroot parameter for compiler")
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
@@ -54,10 +54,6 @@ if(UNIX)