From 125cddcb06b268f52459debf949ff4e037b4919d Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Fri, 5 Sep 2008 17:17:00 +0000 Subject: [PATCH] Move stlport to the top-level. svn path=/nixpkgs/trunk/; revision=12811 --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 756a371a89c..b691c25e9b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1860,7 +1860,7 @@ let }; transformers = import ../development/compilers/transformers { - inherit fetchurl pkgconfig sdf; + inherit fetchurl pkgconfig sdf stlport; aterm = aterm23; stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; @@ -1870,10 +1870,6 @@ let aterm = aterm23; stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; }; - - stlport = import ../development/libraries/stlport { - inherit fetchurl stdenv; - }; }; visualcpp = import ../development/compilers/visual-c++ { @@ -3551,6 +3547,10 @@ let inherit fetchurl stdenv readline; }; + stlport = import ../development/libraries/stlport { + inherit fetchurl stdenv; + }; + t1lib = import ../development/libraries/t1lib { inherit fetchurl stdenv x11; inherit (xlibs) libXaw libXpm;