diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-22 12:26:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 12:26:55 +0000 |
| commit | feda7be3757134aa258c2b6400b8137bc5d3e347 (patch) | |
| tree | 1db20b33919d4e73e9d8f42e6cf901f590e86cc4 /pkgs/development/libraries/audio | |
| parent | e82d74132cd65d2c8aa0f1714fed0fcc39238f89 (diff) | |
| parent | f2b936edf58e999637927994244d3cad5aef84d9 (diff) | |
| download | nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.gz nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.bz2 nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.lz nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.xz nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.zst nixpkgs-feda7be3757134aa258c2b6400b8137bc5d3e347.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/audio')
| -rw-r--r-- | pkgs/development/libraries/audio/rtmidi/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 540e152655f..ccfafd36a8a 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -37,14 +37,16 @@ stdenv.mkDerivation rec { url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; }) + (fetchpatch { + name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; + sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; + }) ]; postPatch = '' substituteInPlace rtmidi.pc.in \ --replace 'Requires:' 'Requires.private:' - substituteInPlace CMakeLists.txt \ - --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ - --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; nativeBuildInputs = [ cmake pkg-config ]; |