diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-02 20:36:11 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-02 20:36:11 +0000 |
| commit | df037ddafd0988981e407bcf026a89666aad047d (patch) | |
| tree | 186239302430959e35f215856fcb041bee9793a3 /pkgs/misc | |
| parent | 5ec7aa7e71204504f684e37680d6a37adbc550ff (diff) | |
| parent | 9758857fbe69d84e98e9ffd9a0f73e1ac94e4bac (diff) | |
| download | nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar.gz nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar.bz2 nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar.lz nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar.xz nixlib-df037ddafd0988981e407bcf026a89666aad047d.tar.zst nixlib-df037ddafd0988981e407bcf026a89666aad047d.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/generator/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/misc/emulators/generator/soundcard.patch | 20 |
2 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/misc/emulators/generator/default.nix b/pkgs/misc/emulators/generator/default.nix deleted file mode 100644 index b4bf72d79d6b..000000000000 --- a/pkgs/misc/emulators/generator/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/misc/emulators/generator/soundcard.patch b/pkgs/misc/emulators/generator/soundcard.patch deleted file mode 100644 index 73cf8fad6953..000000000000 --- a/pkgs/misc/emulators/generator/soundcard.patch +++ /dev/null @@ -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 - |