diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
| commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
| tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/compilers/gerbil | |
| parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
| download | nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip | |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/compilers/gerbil')
| -rw-r--r-- | pkgs/development/compilers/gerbil/build.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b5ccbca6f7e6..9ef650c330fa 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,6 +1,6 @@ { stdenv, makeStaticLibraries, coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, version, git-version, gambit, src }: # TODO: distinct packages for gerbil-release and gerbil-devel @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { inherit src; # Use makeStaticLibraries to enable creation of statically linked binaries - buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; + buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; buildInputs = [ gambit rsync bash ] ++ buildInputs_libraries ++ buildInputs_staticLibraries; - NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm @@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! # LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! # YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! -MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a +MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a # LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a EOF |