diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 1 insertions, 19 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix deleted file mode 100644 index c4ccf7ec15601..0000000000000 --- a/pkgs/development/libraries/glib/default.nix +++ /dev/null @@ -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]); -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86cb34e00d8ea..9230ed10e6349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3430,12 +3430,6 @@ let 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 = let haveRedHatKernel = system == "i686-linux" || system == "x86_64-linux"; haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false; @@ -8079,8 +8073,7 @@ let xmacro = import ../tools/X11/xmacro { inherit fetchurl stdenv; - inherit (xlibs) libX11 libXi - libXtst xextproto inputproto; + inherit (xlibs) libX11 libXi libXtst xextproto inputproto; }; xmove = import ../applications/misc/xmove { |