diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
commit | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (patch) | |
tree | 28f7989183b690ecafdb0360c0fee406aac88bcc /pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | |
parent | 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 (diff) | |
parent | 447d625edc3a488deee1c9b2e5890dd974e55ee3 (diff) | |
download | nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.gz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.bz2 nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.lz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.xz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.zst nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.zip |
Merge branch 'staging' into staging-next
This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
Diffstat (limited to 'pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
-rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 052bfb119498..acc98215af01 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -53,11 +53,11 @@ in cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { - propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; + propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql" ''; }; }; @@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs" }; }; cffi = addNativeLibs [pkgs.libffi]; - cl-mysql = addNativeLibs [pkgs.mysql]; + cl-mysql = addNativeLibs [pkgs.libmysqlclient]; cl-ppcre-template = x: { overrides = y: (x.overrides y) // { postPatch = '' |