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

microsoft_gsl: fix crossSystem build support

Browse Source 
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:
Austin Seipp 2017-11-27 01:39:29 -06:00
parent 40e08aa870
commit 63428868af
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/microsoft_gsl/default.nix
View File

@ -1,5 +1,10 @@
{ stdenv, fetchgit, cmake }: { stdenv, fetchgit, cmake
, hostPlatform, buildPlatform
}:
let
nativeBuild = hostPlatform == buildPlatform;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "microsoft_gsl-${version}"; name = "microsoft_gsl-${version}";
version = "2017-02-13"; version = "2017-02-13";
@ -10,8 +15,11 @@ stdenv.mkDerivation rec {
sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35"; 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 = '' installPhase = ''
mkdir -p $out/include mkdir -p $out/include
@ -23,6 +31,6 @@ stdenv.mkDerivation rec {
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; [ xwvvvvwx ]; maintainers = with maintainers; [ thoughtpolice xwvvvvwx ];
}; };
} }