Merge pull request #60884 from strager/gsl
microsoft_gsl: 2017-02-13 -> 2.0.0
This commit is contained in:
commit
a254bd0fb4
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchgit, cmake
|
{ stdenv, fetchFromGitHub, catch, cmake
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -6,18 +6,19 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "microsoft_gsl-${version}";
|
name = "microsoft_gsl-${version}";
|
||||||
version = "2017-02-13";
|
version = "2.0.0";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchFromGitHub {
|
||||||
url = "https://github.com/Microsoft/GSL.git";
|
owner = "Microsoft";
|
||||||
rev = "3819df6e378ffccf0e29465afe99c3b324c2aa70";
|
repo = "GSL";
|
||||||
sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35";
|
rev = "v${version}";
|
||||||
|
sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# build phase just runs the unit tests, so skip it if
|
# build phase just runs the unit tests, so skip it if
|
||||||
# we're doing a cross build
|
# we're doing a cross build
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ catch cmake ];
|
||||||
buildPhase = if nativeBuild then "make" else "true";
|
buildPhase = if nativeBuild then "make" else "true";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user