public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/tora/default.nix
View File

@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
, qscintilla, qtbase, qttools }:
mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
buildInputs = [
boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
];
preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
"-lssl"
];
NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
qtWrapperArgs = [
''--prefix PATH : ${lib.getBin graphviz}/bin''