Merge pull request #133485 from angustrau/portmidi-r234
This commit is contained in:
commit
17b4b7097f
|
@ -2,13 +2,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "portmidi";
|
pname = "portmidi";
|
||||||
version = "217";
|
version = "234";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/portmedia/portmidi-src-${version}.zip";
|
url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
|
||||||
sha256 = "03rfsk7z6rdahq2ihy5k13qjzgx757f75yqka88v3gc0pn9ais88";
|
sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
|
cd portmidi/trunk
|
||||||
|
'';
|
||||||
|
|
||||||
cmakeFlags = let
|
cmakeFlags = let
|
||||||
#base = "${jdk}/jre/lib/${jdk.architecture}";
|
#base = "${jdk}/jre/lib/${jdk.architecture}";
|
||||||
in [
|
in [
|
||||||
|
|
|
@ -12,17 +12,17 @@ index 4919b78..758eccb 100644
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
|
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
|
--- a/pm_common/CMakeLists.txt
|
||||||
+++ b/pm_common/CMakeLists.txt
|
+++ b/pm_common/CMakeLists.txt
|
||||||
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
|
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
|
||||||
endif(APPLE OR WIN32)
|
endif(APPLE OR WIN32)
|
||||||
|
|
||||||
if(APPLE)
|
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
|
+ set(CMAKE_OSX_SYSROOT / CACHE
|
||||||
PATH "-isysroot parameter for compiler" FORCE)
|
PATH "-isysroot parameter for compiler")
|
||||||
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE
|
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
|
||||||
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
|
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
|
||||||
@@ -54,10 +54,6 @@ if(UNIX)
|
@@ -54,10 +54,6 @@ if(UNIX)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue