diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/compilers/urweb | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/compilers/urweb')
| -rw-r--r-- | pkgs/development/compilers/urweb/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 01d4972a55d5..31381aac741d 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, openssl, mlton -, mysql, postgresql, sqlite, gcc, icu +, libmysqlclient, postgresql, sqlite, gcc, icu }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s"; }; - buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ]; + buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h"; + export MSHEADER="${libmysqlclient}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${openssl.out}/lib \ - -L${mysql.connector-c}/lib \ + -L${libmysqlclient}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; |