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

4
pkgs/development/libraries/kdb/default.nix
View File

@@ -1,7 +1,7 @@
{
mkDerivation, lib, fetchurl,
extra-cmake-modules,
qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
}:
mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
propagatedBuildInputs = [ qtbase ];