add nixStatic and binutilsStatic
svn path=/nixpkgs/trunk/; revision=6055
This commit is contained in:
parent
1c1ad8b285
commit
774f2f73af
@ -414,6 +414,10 @@ rec {
|
|||||||
inherit fetchurl stdenv noSysDirs;
|
inherit fetchurl stdenv noSysDirs;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
binutilsStatic = (import ../development/tools/misc/binutils-static) {
|
||||||
|
inherit fetchurl stdenv noSysDirs;
|
||||||
|
};
|
||||||
|
|
||||||
binutilsMips = (import ../development/tools/misc/binutils-cross) {
|
binutilsMips = (import ../development/tools/misc/binutils-cross) {
|
||||||
inherit fetchurl stdenv noSysDirs;
|
inherit fetchurl stdenv noSysDirs;
|
||||||
cross = "mips-linux";
|
cross = "mips-linux";
|
||||||
@ -2533,11 +2537,6 @@ rec {
|
|||||||
x11Support = false;
|
x11Support = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#nixStatic = (import ../misc/nix-static) {
|
|
||||||
# inherit fetchurl stdenv aterm perl curl;
|
|
||||||
# bdb = db4;
|
|
||||||
#};
|
|
||||||
|
|
||||||
nix = (import ../misc/nix) {
|
nix = (import ../misc/nix) {
|
||||||
inherit fetchurl aterm perl curl;
|
inherit fetchurl aterm perl curl;
|
||||||
bdb = db4;
|
bdb = db4;
|
||||||
@ -2549,6 +2548,11 @@ rec {
|
|||||||
bdb = db4;
|
bdb = db4;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixStatic = (import ../misc/nix-static) {
|
||||||
|
inherit fetchurl stdenv aterm perl curl autoconf automake libtool;
|
||||||
|
bdb = db4;
|
||||||
|
};
|
||||||
|
|
||||||
cups = (import ../misc/cups) {
|
cups = (import ../misc/cups) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user