summary refs log tree commit diff
path: root/pkgs/applications/kde/akonadi
diff options
context:
space:
mode:
authorBastian Köcher <git@kchr.de>2018-01-19 10:00:03 +0100
committerBastian Köcher <git@kchr.de>2018-01-19 10:00:03 +0100
commitd533cec2606790d6d99da948da4394e8dbcd2211 (patch)
tree680792fb7bbdee506f80a82a0a8bf2601b529630 /pkgs/applications/kde/akonadi
parent801dea88f07640995d56677c750d202f507eff36 (diff)
downloadnixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar.gz
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar.bz2
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar.lz
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar.xz
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.tar.zst
nixpkgs-d533cec2606790d6d99da948da4394e8dbcd2211.zip
akonadi: Fixes build
Diffstat (limited to 'pkgs/applications/kde/akonadi')
-rw-r--r--pkgs/applications/kde/akonadi/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index bb7dac1b62a..da7cd2e8d79 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -19,13 +19,13 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
   outputs = [ "out" "dev" ];
-  NIX_CFLAGS_COMPILE = [
-    ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
-    ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''
-    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"''
-    ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"''
-    ''-DNIXPKGS_POSTGRES_PG_CTL=""''
-    ''-DNIXPKGS_POSTGRES_INITDB=""''
+  CXXFLAGS = [
+    ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"''
+    ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"''
+    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
+    ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
+    ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
+    ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
   ];
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""