about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-10-29 23:21:22 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-30 12:15:26 +0100
commit81548bf7da236e213733f1a151a4351ae80e6b93 (patch)
tree5916a054e6b6245c6ccc3b11b3be799d518910d6 /pkgs
parent5117f772468259cc9bd1051c744db563f509baaa (diff)
downloadnixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar.gz
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar.bz2
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar.lz
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar.xz
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.tar.zst
nixlib-81548bf7da236e213733f1a151a4351ae80e6b93.zip
olm: *Flags are lists
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/olm/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 224c01e2c50a..8fbdf28965bf 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -15,9 +15,11 @@ 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";