Convert more applications to libmysql

This commit is contained in:
William A. Kennington III 2015-04-22 16:09:41 -07:00
parent 781d77d507
commit 1adb482638
2 changed files with 6 additions and 6 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, mysql }: shared_desktop_ontologies, marble, libmysql }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "digikam-2.9.0"; name = "digikam-2.9.0";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ]; opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ];
# Make digikam find some FindXXXX.cmake # Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}"; KDEDIRS="${marble}:${qjson}";

View file

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