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

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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