summary refs log tree commit diff
path: root/pkgs/development/libraries/cmocka/default.nix
diff options
context:
space:
mode:
authorAlexey Shmalko <rasen.dubi@gmail.com>2016-09-09 11:14:10 +0300
committervbgl <vbgl@users.noreply.github.com>2016-09-09 10:14:10 +0200
commitde5d64eb2a489d1fcc91fadfad1a33b2f42b036b (patch)
tree56d99df7ca776d465a3bbbc2b26d7ca7688f9cf6 /pkgs/development/libraries/cmocka/default.nix
parentf285ce8fed1f585325ab7b6c1138db4d9ae06909 (diff)
downloadnixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar.gz
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar.bz2
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar.lz
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar.xz
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.tar.zst
nixpkgs-de5d64eb2a489d1fcc91fadfad1a33b2f42b036b.zip
cmocka: fix build for Darwin (#18448)
See https://open.cryptomilk.org/issues/43 for upstream issue.
Diffstat (limited to 'pkgs/development/libraries/cmocka/default.nix')
-rw-r--r--pkgs/development/libraries/cmocka/default.nix16
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 ];
   };
 }