* Removed an unused glib.
svn path=/nixpkgs/trunk/; revision=17989
This commit is contained in:
parent
e5b02bca70
commit
cb1b3a0dbe
@ -1,11 +0,0 @@
|
|||||||
args:
|
|
||||||
args.stdenv.mkDerivation {
|
|
||||||
name = "glib-2.14";
|
|
||||||
|
|
||||||
src = args.fetchurl {
|
|
||||||
url = http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.14/glib-2.14.6.tar.bz2;
|
|
||||||
sha256 = "1fi4xb07d7bfnfi65snvbi6i5kzhr3kad8knbwklj47z779vppvq";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =(with args; [pkgconfig gettext]);
|
|
||||||
}
|
|
@ -3430,12 +3430,6 @@ let
|
|||||||
inherit (xlibs) libXmu libXi;
|
inherit (xlibs) libXmu libXi;
|
||||||
};
|
};
|
||||||
|
|
||||||
# don't know wether this newer version breaks anything..
|
|
||||||
# not replacing the existing one.
|
|
||||||
glib214 = import ../development/libraries/glib {
|
|
||||||
inherit fetchurl stdenv pkgconfig gettext;
|
|
||||||
};
|
|
||||||
|
|
||||||
glibc =
|
glibc =
|
||||||
let haveRedHatKernel = system == "i686-linux" || system == "x86_64-linux";
|
let haveRedHatKernel = system == "i686-linux" || system == "x86_64-linux";
|
||||||
haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false;
|
haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false;
|
||||||
@ -8079,8 +8073,7 @@ let
|
|||||||
|
|
||||||
xmacro = import ../tools/X11/xmacro {
|
xmacro = import ../tools/X11/xmacro {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
inherit (xlibs) libX11 libXi
|
inherit (xlibs) libX11 libXi libXtst xextproto inputproto;
|
||||||
libXtst xextproto inputproto;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xmove = import ../applications/misc/xmove {
|
xmove = import ../applications/misc/xmove {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user