diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-22 15:26:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-22 16:56:33 +0000 |
| commit | 542f80867c380b0ac79250b6e5358dda8bc49e0d (patch) | |
| tree | aa5903f228b2f32c524a9a6e4f6dd94f8c5b869e /nixpkgs/pkgs/development/libraries/olm | |
| parent | f69898c7d5b757342e6ab90d5fcc7c9aea9f5ff4 (diff) | |
| parent | 90441b4b47fc7280de6a5bd1a228017caaa0f97f (diff) | |
| download | nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.gz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.bz2 nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.lz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.xz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.zst nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.zip | |
Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/olm')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/olm/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index 8fbdf28965bf..f63d1d30f558 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "olm"; @@ -9,17 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; }; - doCheck = true; - checkTarget = "test"; - - # requires optimisation but memory operations are compiled with -O0 - hardeningDisable = ["fortify"]; + nativeBuildInputs = [ cmake ]; - makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc"; - - installFlags = [ - "PREFIX=${placeholder ''out''}" - ]; + doCheck = true; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; |