swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-25 22:50:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34038 from bkchr/akonadi_fix

Browse source 
akonadi: Fixes build
This commit is contained in:
adisbladis 2018-01-19 18:09:42 +08:00 committed by GitHub
parent 4fd0a3a43d d533cec260
commit d92eb4c920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/kde/akonadi/default.nix
View file

@ -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\""