diff options
Diffstat (limited to 'nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
-rw-r--r-- | nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 1ff76e3ec4c..5cdeef36840 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -66,11 +66,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" ''; }; }; @@ -90,7 +90,14 @@ $out/lib/common-lisp/query-fs" }; }; cffi = addNativeLibs [pkgs.libffi]; - cl-mysql = addNativeLibs [pkgs.mysql]; + cl-mysql = x: { + propagatedBuildInputs = [pkgs.libmysqlclient]; + overrides = y: (x.overrides y) // { + prePatch = ((x.overrides y).prePatch or "") + '' + sed -i 's,libmysqlclient_r,${pkgs.libmysqlclient}/lib/mysql/libmysqlclient_r,' system.lisp + ''; + }; + }; cl-ppcre-template = x: { overrides = y: (x.overrides y) // { postPatch = '' |