diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-21 16:25:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 16:25:49 -0600 |
| commit | 3bf9cc3154c5a7238ca66d2e95ca48e561433986 (patch) | |
| tree | 1f1e021bed75f1292b28d4aba018c5d5d35b57ef /pkgs/development/libraries | |
| parent | d6430f3f77e64ae677fe59bbf41da1f9d85cad4b (diff) | |
| parent | 7d52215f14986075477ce2052b690109b9116786 (diff) | |
| download | nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar.gz nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar.bz2 nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar.lz nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar.xz nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.tar.zst nixpkgs-3bf9cc3154c5a7238ca66d2e95ca48e561433986.zip | |
Merge pull request #76767 from dtzWill/update/spectral-2019-12-23
spectral: unstable 2019-08-30 -> 817, olm: cmake+clean
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/olm/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 8fbdf28965b..f63d1d30f55 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/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"; |