mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
Now glibc-NPTL builds...
svn path=/nixpkgs/trunk/; revision=9162
This commit is contained in:
parent
a9f676e098
commit
cfab5a8cf9
@ -1,16 +1,18 @@
|
|||||||
{ stdenv, fetchurl, kernelHeaders
|
{ stdenv, fetchurl, kernelHeaders
|
||||||
|
,perl
|
||||||
, installLocales ? true
|
, installLocales ? true
|
||||||
, profilingLibraries ? false
|
, profilingLibraries ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "glibc-2.5-nptl";
|
name = "glibc-2.6.1-nptl";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src =
|
||||||
url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
|
fetchurl {
|
||||||
md5 = "1fb29764a6a650a4d5b409dda227ac9f";
|
url = http://ftp.gnu.org/gnu/glibc/glibc-2.6.1.tar.bz2;
|
||||||
};
|
sha256 = "08pcfsi9zpikjakljklks2ln3hn7544cr9br4kbh5kx27cy3mv9x";
|
||||||
|
};
|
||||||
|
|
||||||
patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ];
|
patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ];
|
||||||
|
|
||||||
@ -18,6 +20,8 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
inherit (stdenv) is64bit;
|
inherit (stdenv) is64bit;
|
||||||
|
|
||||||
|
buildInputs=[perl];
|
||||||
|
|
||||||
# `--with-tls --without-__thread' enables support for TLS but causes
|
# `--with-tls --without-__thread' enables support for TLS but causes
|
||||||
# it not to be used. Required if we don't want to barf on 2.4
|
# it not to be used. Required if we don't want to barf on 2.4
|
||||||
# kernels. Or something.
|
# kernels. Or something.
|
||||||
|
@ -1421,7 +1421,8 @@ rec {
|
|||||||
});
|
});
|
||||||
|
|
||||||
glibcNPTL = import ../development/libraries/glibc-nptl {
|
glibcNPTL = import ../development/libraries/glibc-nptl {
|
||||||
inherit stdenv fetchurl kernelHeaders;
|
inherit fetchurl kernelHeaders perl;
|
||||||
|
stdenv = overrideGCC stdenv gcc34;
|
||||||
};
|
};
|
||||||
|
|
||||||
glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
|
glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
|
||||||
|
Loading…
Reference in New Issue
Block a user