Move stlport to the top-level.
svn path=/nixpkgs/trunk/; revision=12811
This commit is contained in:
parent
517a120ff8
commit
125cddcb06
|
@ -1860,7 +1860,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
transformers = import ../development/compilers/transformers {
|
transformers = import ../development/compilers/transformers {
|
||||||
inherit fetchurl pkgconfig sdf;
|
inherit fetchurl pkgconfig sdf stlport;
|
||||||
aterm = aterm23;
|
aterm = aterm23;
|
||||||
|
|
||||||
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
|
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
|
||||||
|
@ -1870,10 +1870,6 @@ let
|
||||||
aterm = aterm23;
|
aterm = aterm23;
|
||||||
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
|
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
|
||||||
};
|
};
|
||||||
|
|
||||||
stlport = import ../development/libraries/stlport {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
visualcpp = import ../development/compilers/visual-c++ {
|
visualcpp = import ../development/compilers/visual-c++ {
|
||||||
|
@ -3551,6 +3547,10 @@ let
|
||||||
inherit fetchurl stdenv readline;
|
inherit fetchurl stdenv readline;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
stlport = import ../development/libraries/stlport {
|
||||||
|
inherit fetchurl stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
t1lib = import ../development/libraries/t1lib {
|
t1lib = import ../development/libraries/t1lib {
|
||||||
inherit fetchurl stdenv x11;
|
inherit fetchurl stdenv x11;
|
||||||
inherit (xlibs) libXaw libXpm;
|
inherit (xlibs) libXaw libXpm;
|
||||||
|
|
Loading…
Reference in New Issue