summary refs log tree commit diff
path: root/pkgs/development/libraries/libdbi-drivers
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-04-22 16:06:33 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-04-22 16:06:33 -0700
commit5129c67fd38dfdc3591d9ea1274b2ed432962b2a (patch)
tree1664dc378e060c31e4317ef06bb33596da23d3f7 /pkgs/development/libraries/libdbi-drivers
parent618c0519850e9416c788b563bb86939cb9e44baa (diff)
downloadnixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar.gz
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar.bz2
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar.lz
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar.xz
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.tar.zst
nixpkgs-5129c67fd38dfdc3591d9ea1274b2ed432962b2a.zip
libdbi-drivers: Use libmysql
Diffstat (limited to 'pkgs/development/libraries/libdbi-drivers')
-rw-r--r--pkgs/development/libraries/libdbi-drivers/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 8836b0bffa2..ccc0a199654 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, mysql ? null, sqlite ? null, postgresql ? null
+, libmysql ? null, sqlite ? null, postgresql ? null
 }:
 
 with stdenv.lib;
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ]
-    ++ optional (mysql != null) mysql.lib;
+  buildInputs = [ libdbi libmysql sqlite postgresql ];
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (mysql != null) [
+  ] ++ optionals (libmysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${mysql.lib}/include/mysql"
-    "--with-mysql-libdir=${mysql.lib}/lib/mysql"
+    "--with-mysql-incdir=${libmysql}/include/mysql"
+    "--with-mysql-libdir=${libmysql}/lib/mysql"
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"