pyrox.dev
libjack2: fix build with gcc-7 via upstream patch
+13
-4
pkgs/misc/jackaudio/default.nix
+13
-4
pkgs/misc/jackaudio/default.nix
···
1
-
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
2
, bash, libsamplerate, libsndfile, readline, eigen, celt
3
# Darwin Dependencies
4
, aften, AudioToolbox, CoreAudio, CoreFoundation
···
41
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
42
] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
43
44
-
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
45
-
patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
46
-
47
prePatch = ''
48
substituteInPlace svnversion_regenerate.sh \
49
--replace /bin/bash ${bash}/bin/bash
50
'';
51
52
# It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
53
# since frameworks are impure we also have to use the impure CoreFoundation here.
···
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
2
, bash, libsamplerate, libsndfile, readline, eigen, celt
3
# Darwin Dependencies
4
, aften, AudioToolbox, CoreAudio, CoreFoundation
···
41
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
42
] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
43
44
prePatch = ''
45
substituteInPlace svnversion_regenerate.sh \
46
--replace /bin/bash ${bash}/bin/bash
47
'';
48
+
49
+
patches =
50
+
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
51
+
stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ]
52
+
++ stdenv.lib.optional (!stdenv.isDarwin) [ # collides with ./clang.patch
53
+
(fetchpatch {
54
+
name = "gcc-7.patch";
55
+
url = "https://patch-diff.githubusercontent.com/raw/jackaudio/jack2/pull/277.diff";
56
+
sha256 = "003xy7rd0fa8ss7wy0qhl4rm8sv5w0y46r7x76iac0km318ydkbv";
57
+
})
58
+
];
59
+
60
61
# It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
62
# since frameworks are impure we also have to use the impure CoreFoundation here.