Skip to content

Commit

Permalink
microsoft_gsl: fix crossSystem build support
Browse files Browse the repository at this point in the history
cmake needs to be part of nativeBuildInputs, otherwise you get a very unhelpful
debugging trace.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
  • Loading branch information
thoughtpolice committed Nov 27, 2017
1 parent 40e08aa commit 6342886
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions pkgs/development/libraries/microsoft_gsl/default.nix
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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
Expand All @@ -20,9 +28,9 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Functions and types that are suggested for use by the C++ Core Guidelines";
homepage = https://github.com/Microsoft/GSL;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ xwvvvvwx ];
homepage = https://github.com/Microsoft/GSL;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice xwvvvvwx ];
};
}

0 comments on commit 6342886

Please sign in to comment.