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

Convert more applications to libmysql

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/digikam/2.nix
View File

@ -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}";

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

@ -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