diff options
| author | Josef Kemetmueller <josef.kemetmueller@aon.at> | 2017-02-02 20:47:01 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2017-02-03 13:13:54 +0100 |
| commit | fd005d0d7283dd62c69598c6bb7969b69ac9ebb8 (patch) | |
| tree | 2498a3b4d3fcaedb2472c5a69ba4853fc76ef995 /pkgs/development/libraries/catch | |
| parent | 9eb540b807b0bb598352e550635c45c8a92d72b0 (diff) | |
| download | nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar.gz nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar.bz2 nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar.lz nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar.xz nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.tar.zst nixpkgs-fd005d0d7283dd62c69598c6bb7969b69ac9ebb8.zip | |
catch: use upstream install target
Diffstat (limited to 'pkgs/development/libraries/catch')
| -rw-r--r-- | pkgs/development/libraries/catch/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 9a3b9d8e8aa..021512a40e7 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; }; } |