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

Re-Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+4 -4
View File
@@ -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 = ''