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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=31987
This commit is contained in:
Yury G. Kudryashov
2012-02-02 20:36:11 +00:00
parent 5ec7aa7e71 9758857fbe
commit df037ddafd
88 changed files with 812 additions and 1962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/misc/emulators/generator/default.nix
View File

@@ -1,13 +0,0 @@
{stdenv, fetchurl, gtk, SDL, nasm, zlib, bzip2, libjpeg}:
stdenv.mkDerivation {
name = "generator-0.35-cbiere-r3";
src = fetchurl {
url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2;
sha256 = "0jw2ibbjyms9sklapnb6pzkmk680zsqq9pd51r2n4957zv1f36jd";
};
configureFlags = "--with-gtk --with-raze --with-sdl-audio";
buildInputs = [gtk SDL nasm zlib bzip2 libjpeg];
# Only required when not using SDL audio.
# patches = [./soundcard.patch];
}

20
pkgs/misc/emulators/generator/soundcard.patch
View File

@@ -1,20 +0,0 @@
diff -rc generator-orig/main/gensoundp-unix.c generator-0.35-cbiere/main/gensoundp-unix.c
*** generator-orig/main/gensoundp-unix.c 2004-09-26 19:07:44.000000000 +0200
--- generator-0.35-cbiere/main/gensoundp-unix.c 2004-09-26 19:07:56.000000000 +0200
***************
*** 196,202 ****
#include <soundcard.h>
#else
! #ifdef HAVE_SOUNDCARD_H
#include <sys/soundcard.h>
#endif
--- 196,202 ----
#include <soundcard.h>
#else
! #ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
#endif