diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
| commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
| tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/games/zod | |
| parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
| download | nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip | |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/games/zod')
| -rw-r--r-- | pkgs/games/zod/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 888b7bd3d6aa..c14eda2968e0 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 -, libmysqlclient, makeWrapper }: +, mysql, makeWrapper }: stdenv.mkDerivation { name = "zod-engine-2011-03-18"; @@ -24,9 +24,9 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ]; - NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; + NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod |