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

mariadb: clean up during the rebuild from merging #33513

Browse Source
This commit is contained in:
Orivej Desh 2018-01-06 18:43:26 +00:00
parent 729f97ef9b
commit 45f6d97e6e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/sql/mariadb/default.nix
View File

@ -26,11 +26,9 @@ common = rec { # attributes common to both builds
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
ncurses openssl zlib pcre jemalloc ncurses openssl zlib pcre jemalloc libiconv
] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
# FIXME: move libiconv outside isDarwin on staging.
++ optional stdenv.isDarwin libiconv;
prePatch = '' prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt 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 ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ openssl zlib ]; propagatedBuildInputs = [ openssl zlib ];
# FIXME: move libiconv outside isDarwin on staging. buildInputs = [ libiconv ];
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
enableParallelBuilding = true; enableParallelBuilding = true;