diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-09-05 15:29:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 15:29:44 +0000 |
| commit | 47ec95715a091a2205ca636c3cf5e8e35d043a12 (patch) | |
| tree | a8c0b44dc3868aad3b5bea07fe9632a40fb4e012 /pkgs | |
| parent | 5d848f0abcbeee2cf227c11316791ab1b563ca6d (diff) | |
| parent | bd540d9370a9b3a4dc3a606e1a95a71ba95955a1 (diff) | |
| download | nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar.gz nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar.bz2 nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar.lz nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar.xz nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.tar.zst nixlib-47ec95715a091a2205ca636c3cf5e8e35d043a12.zip | |
Merge pull request #28970 from disassembler/lenmus
lenmus: fixing build with gcc6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/lenmus/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index f0c86fb67dbe..4ac0dc2eb944 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub +{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch , cmake, boost , portmidi, sqlite , freetype, libpng, pngpp, zlib @@ -22,6 +22,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + (fetchpatch { + url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; + sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs"; + }) + (fetchpatch { + url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch"; + sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn"; + }) + ]; + buildInputs = [ pkgconfig cmake boost |