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

treewide: fixup various mysql ocurrences after re-split

Browse Source
This commit is contained in:
Vladimír Čunát
2016-08-01 17:46:30 +02:00
parent 9a072482e6
commit 950feb70b2
15 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/lisp-modules/lisp-packages.nix
View File

@@ -192,7 +192,7 @@ let lispPackages = rec {
version = "git-20150514";
description = "Common Lisp SQL Interface library";
deps = [uffi];
buildInputs = [pkgs.mysql.lib pkgs.zlib];
buildInputs = [pkgs.mysql.client pkgs.zlib];
# Source type: git
src = pkgs.fetchgit {
url =
@@ -204,8 +204,8 @@ let lispPackages = rec {
};
overrides = x:{
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
'';
};
};