diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-01 17:46:30 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 20:46:37 +0200 |
commit | 950feb70b2e43e300bd0f285eb6e3ad446ca0722 (patch) | |
tree | f245993b24df468364c224dc9f3a3b29cb2539f4 /pkgs/development | |
parent | 9a072482e69ab90c09ce2ca464a4316fb07c4a45 (diff) | |
download | nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.gz nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.bz2 nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.lz nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.xz nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.zst nixpkgs-950feb70b2e43e300bd0f285eb6e3ad446ca0722.zip |
treewide: fixup various mysql ocurrences after re-split
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/hhvm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/urweb/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libdbi-drivers/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/opendbx/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/lisp-modules/lisp-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/mysql/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/pure-modules/glpk/default.nix | 2 |
9 files changed, 19 insertions, 24 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 59fb90d78cd..ef4aa44d436 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl + [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # occasional build problems; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; - MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; - MYSQL_DIR=mariadb; # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index d9c448970c9..638b10f76d5 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, openssl, mlton +{ stdenv, lib, fetchurl, file, openssl, mlton , mysql, postgresql, sqlite }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65"; }; - buildInputs = [ openssl mlton mysql postgresql sqlite ]; + buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; + export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CCARGS="-I$out/include \ - -L${mysql.lib}/lib/mysql \ + -L${lib.getLib mysql.client}/lib/mysql \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index df634147f58..3188d942441 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -107,7 +107,7 @@ let }; mysql = { - configureFlags = ["--with-mysql=${mysql.lib}"]; + configureFlags = ["--with-mysql"]; buildInputs = [ mysql.lib ]; }; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index f64174778b2..77c09f3ed15 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (libmysql != null) [ "--with-mysql" - "--with-mysql-incdir=${libmysql}/include/mysql" - "--with-mysql-libdir=${libmysql}/lib/mysql" ] ++ optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 03e7718a3ae..37afa3fd507 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, readline, mysql, postgresql, sqlite }: +let + inherit (stdenv.lib) getDev getLib; +in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; @@ -9,10 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${mysql.lib}/include/mysql" - export LDFLAGS="-L${mysql.lib}/lib/mysql" + export CPPFLAGS="-I${getDev mysql.client}/include/mysql" + export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [ readline mysql.lib postgresql sqlite ]; + buildInputs = [ readline mysql.client postgresql sqlite ]; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e7b4b907df9..949f3f5b778 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index e8ec8f2aa24..abadf07a574 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -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" ''; }; }; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 3131d8212e4..ce3487a80a0 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -23,15 +23,11 @@ stdenv.mkDerivation { "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib mysql.lib camlp4 ]; + buildInputs = [ocaml findlib camlp4 ]; createFindlibDestdir = true; - propagatedBuildInputs = [ mysql.lib ]; - - preConfigure = '' - export LDFLAGS="-L${mysql.lib}/lib/mysql" - ''; + propagatedBuildInputs = [ mysql.client ]; buildPhase = '' make diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 22d2bc17738..af13e856632 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${libmysql}/include/mysql + --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" |