diff options
| author | Angus Trau <me@angus.ws> | 2021-08-11 20:08:54 +1000 |
|---|---|---|
| committer | Angus Trau <me@angus.ws> | 2021-08-12 08:36:20 +1000 |
| commit | 677f1be58926961ab29126ad12142c17e6d0aa29 (patch) | |
| tree | f943898c176d566568ebf3984de039f60ab458dd /pkgs/development/libraries/portmidi | |
| parent | 3693fbaba55aaf3627c83c071923d9d19afa2481 (diff) | |
| download | nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar.gz nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar.bz2 nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar.lz nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar.xz nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.tar.zst nixpkgs-677f1be58926961ab29126ad12142c17e6d0aa29.zip | |
portmidi: 217 -> 234
Diffstat (limited to 'pkgs/development/libraries/portmidi')
| -rw-r--r-- | pkgs/development/libraries/portmidi/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/portmidi/remove-darwin-variables.diff | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index bdc6a44f00b..2b8f006a755 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -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 [ diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff index 975dbb57b59..15ed874f172 100644 --- a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff +++ b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff @@ -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) |