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

Merge pull request #31712 from stephengroat/patch-1 

cmocka: 1.0.1 -> 1.1.1
This commit is contained in:
Renaud 2017-11-15 23:37:44 +01:00 committed by GitHub
parent a5b611defc bec7c22dca
commit 958d6038e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/cmocka/default.nix
View File

@ -1,26 +1,15 @@
{ fetchurl, stdenv, cmake, fetchpatch }: { fetchurl, stdenv, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cmocka-${version}"; name = "cmocka-${version}";
version = "1.0.1"; majorVersion = "1.1";
version = "${majorVersion}.1";
src = fetchurl { src = fetchurl {
url = "https://cmocka.org/files/1.0/cmocka-${version}.tar.xz"; url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz";
sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k"; sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389";
}; };
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 ]; nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; { meta = with stdenv.lib; {