Merge pull request #130527 from NickCao/microsoft_gsl
This commit is contained in:
commit
d3660246ef
1 changed files with 25 additions and 23 deletions
|
@ -1,44 +1,46 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, catch, cmake
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, gtest
|
||||||
|
, fetchurl
|
||||||
|
, pkg-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform;
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "microsoft_gsl";
|
pname = "microsoft_gsl";
|
||||||
version = "2.1.0";
|
version = "3.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Microsoft";
|
owner = "Microsoft";
|
||||||
repo = "GSL";
|
repo = "GSL";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "09f08lxqm00152bx9yrizlgabzpzxlpbv06h00z4w78yxywgxlgx";
|
sha256 = "sha256-gIpyuNlp3mvR8r1Azs2r76ElEodykRLGAwMN4BDJez0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# build phase just runs the unit tests, so skip it if
|
patches = [
|
||||||
# we're doing a cross build
|
# Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525
|
||||||
nativeBuildInputs = [ catch cmake ];
|
(fetchurl {
|
||||||
buildPhase = if nativeBuild then "make" else "true";
|
url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch";
|
||||||
|
sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# https://github.com/microsoft/GSL/issues/806
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
cmakeFlags = lib.optionals stdenv.cc.isGNU
|
buildInputs = [ gtest ];
|
||||||
[ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ];
|
|
||||||
|
|
||||||
installPhase = ''
|
doCheck = true;
|
||||||
mkdir -p $out/include
|
|
||||||
mv ../include/ $out/
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "C++ Core Guideline support library";
|
description = "C++ Core Guideline support library";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
The Guideline Support Library (GSL) contains functions and types that are suggested for
|
The Guideline Support Library (GSL) contains functions and types that are suggested for
|
||||||
use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
|
use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
|
||||||
This package contains Microsoft's implementation of GSL.
|
This package contains Microsoft's implementation of GSL.
|
||||||
'';
|
'';
|
||||||
homepage = "https://github.com/Microsoft/GSL";
|
homepage = "https://github.com/Microsoft/GSL";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
|
maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue