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

Remove glib-1.x and its reverse dependencies

Browse Source 
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
This commit is contained in:
Yury G. Kudryashov 2012-01-28 13:06:07 +00:00
parent 4b36b6132f
commit 9d67ff2a48
8 changed files with 0 additions and 1591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1475
pkgs/applications/audio/xmms/alsa.patch
View File

File diff suppressed because it is too large Load Diff

21
pkgs/applications/audio/xmms/default.nix
View File

@ -1,21 +0,0 @@
{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}:
stdenv.mkDerivation {
name = "xmms-1.2.10";
src = fetchurl {
url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
};
# Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
patches = [./alsa.patch];
buildInputs = [alsaLib esound libogg libvorbis glib gtk];
meta = {
description = "A music player very similar to Winamp";
homepage = http://www.xmms.org;
platforms = stdenv.lib.platforms.linux;
};
}

12
pkgs/development/libraries/glib/1.2.x.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "glib-1.2.10";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
md5 = "6fe30dad87c77b91b632def29dd69ef9";
};
# Patch for gcc 3.4 compatibility. Based on
# http://cvs.openpkg.org/chngview?cn=16208.
patches = [./gcc34.patch];
}

20
pkgs/development/libraries/glib/gcc34.patch
View File

@ -1,20 +0,0 @@
diff -rc glib-orig/glib.h glib-1.2.10/glib.h
*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100
--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200
***************
*** 272,278 ****
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
! #ifdef __GNUC__
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */
--- 272,278 ----
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */

12
pkgs/development/libraries/gtk+/1.2.x.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, x11, glib}:
stdenv.mkDerivation {
name = "gtk+-1.2.10";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
};
propagatedBuildInputs = [x11 glib];
}

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

18
pkgs/top-level/all-packages.nix
View File

@ -3690,14 +3690,6 @@ let
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
glib = callPackage ../development/libraries/glib/1.2.x.nix { };
gtk = callPackage ../development/libraries/gtk+/1.2.x.nix { };
});
gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
@ -7765,12 +7757,6 @@ let
xineUI = callPackage ../applications/video/xine-ui { };
xmms = callPackage ../applications/audio/xmms {
inherit (gnome) esound;
inherit (gtkLibs1x) glib gtk;
stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
};
xneur = callPackage ../applications/misc/xneur {
GStreamer=gst_all.gstreamer;
inherit (gtkLibs) glib gtk pango atk gdk_pixbuf;
@ -8533,10 +8519,6 @@ let
python = pythonFull;
};
generator = callPackage ../misc/emulators/generator {
inherit (gtkLibs1x) gtk;
};
gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
ghostscript = callPackage ../misc/ghostscript {