diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/olm')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/olm/default.nix | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index dd3f83a0130d..8fbdf28965bf 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,18 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.0.0"; - - meta = { - description = "Implements double cryptographic ratchet and Megolm ratchet"; - license = stdenv.lib.licenses.asl20; - homepage = https://matrix.org/git/olm/about; - platforms = with stdenv.lib.platforms; darwin ++ linux; - }; + version = "3.1.4"; src = fetchurl { - url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz"; - sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; + url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; + sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; }; doCheck = true; @@ -22,7 +15,16 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; - makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc"; - installFlags = "PREFIX=$(out)"; + installFlags = [ + "PREFIX=${placeholder ''out''}" + ]; + + meta = { + description = "Implements double cryptographic ratchet and Megolm ratchet"; + license = stdenv.lib.licenses.asl20; + homepage = https://matrix.org/git/olm/about; + platforms = with stdenv.lib.platforms; darwin ++ linux; + }; } |