diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
| commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
| tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/applications/networking/instant-messengers/utox/default.nix | |
| parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
| parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
| download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip | |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/utox/default.nix')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/utox/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 5955ecb60bd9..531ca5cbadc6 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -22,15 +22,16 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - check cmake pkgconfig + cmake pkgconfig ]; cmakeFlags = [ "-DENABLE_AUTOUPDATE=OFF" - ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON"; - - doCheck = stdenv.isLinux; + "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}" + ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkInputs = [ check ]; checkPhase = '' runHook preCheck ctest -VV |