From 9e83312bd104e8a15c7eaaf7719dc50d36b7a733 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 4 Apr 2008 16:58:19 +0000 Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=11461 --- pkgs/development/libraries/glib/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/glib/default.nix diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix new file mode 100644 index 00000000000..c4ccf7ec156 --- /dev/null +++ b/pkgs/development/libraries/glib/default.nix @@ -0,0 +1,11 @@ +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]); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0071abb54e2..8d58a0184e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2421,6 +2421,12 @@ let pkgs = rec { 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 = useFromStdenv "glibc" (import ../development/libraries/glibc-2.7 { inherit fetchurl stdenv kernelHeaders;