diff options
| -rw-r--r-- | pkgs/applications/graphics/digikam/2.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/zod/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix index c239827633f0..e2ca03fe044e 100644 --- a/pkgs/applications/graphics/digikam/2.nix +++ b/pkgs/applications/graphics/digikam/2.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, mysql }: +shared_desktop_ontologies, marble, libmysql }: stdenv.mkDerivation rec { name = "digikam-2.9.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff 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 KDEDIRS="${marble}:${qjson}"; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 0d55f1cd13e0..9975aa1b15b7 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer, - mysql, makeWrapper }: +{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer +, libmysql, makeWrapper }: stdenv.mkDerivation rec { name = "zod-engine-2011-03-18"; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { 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 ]; - NIX_LDFLAGS="-L${mysql.lib}/lib/mysql"; + NIX_LDFLAGS="-L${libmysql}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod |