From fd005d0d7283dd62c69598c6bb7969b69ac9ebb8 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Thu, 2 Feb 2017 20:47:01 +0100 Subject: [PATCH] catch: use upstream install target --- pkgs/development/libraries/catch/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 9a3b9d8e8aa8..021512a40e70 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, fetchFromGitHub }: +{ stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { @@ -13,25 +13,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake ]; - dontUseCmakeConfigure = true; + cmakeFlags = [ "-DUSE_CPP14=ON" ]; - buildPhase = '' - cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON - cd Build - make - cd .. - ''; - - installPhase = '' - mkdir -p $out - mv include $out/. - ''; + doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; }; }