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

More mysql migrations

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-01 16:50:47 -07:00
parent a604b42480
commit b524480695
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/grass/default.nix
View File

@ -87,10 +87,10 @@ a.composableDerivation.composableDerivation {} (fix: {
// wwf {
name = "mysql";
enable = {
buildInputs = [ a.mysql ];
buildInputs = [ a.mysql.lib ];
configureFlags = [
"--with-mysql-libs=${a.mysql}/lib/mysql"
"--with-mysql-includes=${a.mysql}/include/mysql"
"--with-mysql-libs=${a.mysql.lib}/lib/mysql"
"--with-mysql-includes=${a.mysql.lib}/include/mysql"
];
};
}

2
pkgs/development/libraries/gdal/default.nix
View File

@ -24,7 +24,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
"--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql}/bin/mysql_config"
"--with-mysql=${mysql.lib}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional

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

@ -193,7 +193,7 @@ let lispPackages = rec {
version = "git-20141112";
description = "Common Lisp SQL Interface library";
deps = [uffi];
buildInputs = [pkgs.mysql pkgs.zlib];
buildInputs = [pkgs.mysql.lib pkgs.zlib];
# Source type: git
src = pkgs.fetchgit {
url = ''http://git.b9.com/clsql.git'';
@ -202,8 +202,8 @@ let lispPackages = rec {
};
overrides = x:{
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql"
'';
};
};

4
pkgs/games/zod/default.nix
View File

@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
sourceRoot=`pwd`/src
'';
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib
makeWrapper ];
NIX_LDFLAGS="-L${mysql}/lib/mysql";
NIX_LDFLAGS="-L${mysql.lib}/lib/mysql";
installPhase = ''
mkdir -p $out/bin $out/share/zod