diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-06 18:43:26 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-01-06 18:45:38 +0000 |
| commit | 45f6d97e6e486602cb26a09d13c63619aafbd1b7 (patch) | |
| tree | 4fcc0f59b79a9976c785bd074053a8625d483d9e /pkgs/servers/sql | |
| parent | 729f97ef9b621975376470d6dd955cfe883b2e8b (diff) | |
| download | nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar.gz nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar.bz2 nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar.lz nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar.xz nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.tar.zst nixlib-45f6d97e6e486602cb26a09d13c63619aafbd1b7.zip | |
mariadb: clean up during the rebuild from merging #33513
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f72a8a77d912..91d288c6a9e4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -26,11 +26,9 @@ common = rec { # attributes common to both builds nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - ncurses openssl zlib pcre jemalloc + ncurses openssl zlib pcre jemalloc libiconv ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ] - # FIXME: move libiconv outside isDarwin on staging. - ++ optional stdenv.isDarwin libiconv; + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -184,8 +182,7 @@ connector-c = stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ openssl zlib ]; - # FIXME: move libiconv outside isDarwin on staging. - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; enableParallelBuilding = true; |