diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
| commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
| tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/olm | |
| parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
| parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
| download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip | |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/olm')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/olm/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index 4749efb5f006..49daff30e7b5 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; homepage = https://matrix.org/git/olm/about; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; src = fetchurl { @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; + makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + installFlags = "PREFIX=$(out)"; } |