public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "libjack2: fix build with gcc-7 via upstream patch"

Browse Source 
This reverts commit 4efdd7e87dde31fe301a7d28050ba577ad496845.
libjack2 was updated in the meantime.
This commit is contained in:
Vladimír Čunát 2018-02-10 09:34:13 +01:00
parent c135ecd7ef
commit 5699a12b80
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/misc/jackaudio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt , bash, libsamplerate, libsndfile, readline, eigen, celt
# Darwin Dependencies # Darwin Dependencies
, aften, AudioToolbox, CoreAudio, CoreFoundation , aften, AudioToolbox, CoreAudio, CoreFoundation
@ -41,23 +41,14 @@ stdenv.mkDerivation rec {
optDbus optPythonDBus optLibffado optAlsaLib optLibopus optDbus optPythonDBus optLibffado optAlsaLib optLibopus
] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
prePatch = '' prePatch = ''
substituteInPlace svnversion_regenerate.sh \ substituteInPlace svnversion_regenerate.sh \
--replace /bin/bash ${bash}/bin/bash --replace /bin/bash ${bash}/bin/bash
''; '';
patches =
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ]
++ stdenv.lib.optional (!stdenv.isDarwin) [ # collides with ./clang.patch
(fetchpatch {
name = "gcc-7.patch";
url = "https://patch-diff.githubusercontent.com/raw/jackaudio/jack2/pull/277.diff";
sha256 = "003xy7rd0fa8ss7wy0qhl4rm8sv5w0y46r7x76iac0km318ydkbv";
})
];
# It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h> # It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
# since frameworks are impure we also have to use the impure CoreFoundation here. # since frameworks are impure we also have to use the impure CoreFoundation here.
# FIXME: remove when CoreFoundation is updated to 10.11 # FIXME: remove when CoreFoundation is updated to 10.11