mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
microsoft_gsl: fix crossSystem build support
cmake needs to be part of nativeBuildInputs, otherwise you get a very unhelpful debugging trace. Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
parent
40e08aa870
commit
63428868af
@ -1,5 +1,10 @@
|
||||
{ stdenv, fetchgit, cmake }:
|
||||
{ stdenv, fetchgit, cmake
|
||||
, hostPlatform, buildPlatform
|
||||
}:
|
||||
|
||||
let
|
||||
nativeBuild = hostPlatform == buildPlatform;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "microsoft_gsl-${version}";
|
||||
version = "2017-02-13";
|
||||
@ -10,8 +15,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35";
|
||||
};
|
||||
|
||||
# build phase just runs the unit tests
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
# build phase just runs the unit tests, so skip it if
|
||||
# we're doing a cross build
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildPhase = if nativeBuild then "make" else "true";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include
|
||||
@ -23,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/Microsoft/GSL;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
maintainers = with maintainers; [ thoughtpolice xwvvvvwx ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user