pyrox.dev
Convert more applications to libmysql
+2
-2
pkgs/applications/graphics/digikam/2.nix
+2
-2
pkgs/applications/graphics/digikam/2.nix
···
1
1
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
2
2
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
3
3
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
4
-
shared_desktop_ontologies, marble, mysql }:
4
+
shared_desktop_ontologies, marble, libmysql }:
5
5
6
6
stdenv.mkDerivation rec {
7
7
name = "digikam-2.9.0";
···
15
15
16
16
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
17
17
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
18
-
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ];
18
+
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ];
19
19
20
20
# Make digikam find some FindXXXX.cmake
21
21
KDEDIRS="${marble}:${qjson}";
+4
-4
pkgs/games/zod/default.nix
+4
-4
pkgs/games/zod/default.nix
···
1
-
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer,
2
-
mysql, makeWrapper }:
1
+
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
2
+
, libmysql, makeWrapper }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
name = "zod-engine-2011-03-18";
···
22
22
sourceRoot=`pwd`/src
23
23
'';
24
24
25
-
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib
25
+
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
26
26
makeWrapper ];
27
27
28
-
NIX_LDFLAGS="-L${mysql.lib}/lib/mysql";
28
+
NIX_LDFLAGS="-L${libmysql}/lib/mysql";
29
29
30
30
installPhase = ''
31
31
mkdir -p $out/bin $out/share/zod