diff options
| -rw-r--r-- | pkgs/development/libraries/cmocka/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 96ef5112ef6..f352357ac21 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake }: +{ fetchurl, stdenv, cmake, fetchpatch }: stdenv.mkDerivation rec { name = "cmocka-${version}"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k"; }; + patches = [ + # This fixes the build for clang-3.7.0 and thus Darwin. + # See https://open.cryptomilk.org/issues/43 for more info. + # + # The patch is already merged to upstream, so it should be removed + # here on next release. + (fetchpatch { + url = "https://git.cryptomilk.org/projects/cmocka.git/patch/?id=1b595a80934fa95234fb290913cfe533f740d965"; + sha256 = "1fg8xwb1mrrmw4dqa65ghnvgfdkpi0lv4j2gq0lm9ayvsi3v00vp"; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { @@ -43,6 +55,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ kragniz ]; + maintainers = with maintainers; [ kragniz rasendubi ]; }; } |