nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 19:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

BDW-GC: Default to the current CVS version.

Browse Source 
svn path=/nixpkgs/trunk/; revision=25669
This commit is contained in:
Ludovic Courtès 2011-01-22 21:34:18 +00:00
parent 3593d48524
commit 04bd33d520
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -1,17 +1,32 @@
{stdenv, fetchurl}: { stdenv, fetchurl, cvsVersion ? true, fetchcvs ? null
, autoconf ? null, automake ? null, libtool ? null }:
let let
version = if stdenv.isMips then "7.2alpha4" else "7.1"; cvs = cvsVersion;
version = if !cvs then "7.1" else "7.2pre20110122";
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "boehm-gc-${version}"; name = "boehm-gc-${version}";
src = fetchurl { src =
url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${version}.tar.gz"; if version == "7.1"
sha256 = (if version == "7.1" then "0c5zrsdw0rsli06lahcqwwz0prgah340fhfg7ggfgvz3iw1gdkp3" then fetchurl {
else if version == "7.2alpha4" then "1ya9hr1wbx0hrx29q5zy2k51ml71k9mhqzqs7f505qr9s6jsfh0b" url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${version}.tar.gz";
else throw "Version unknown"); sha256 = "0c5zrsdw0rsli06lahcqwwz0prgah340fhfg7ggfgvz3iw1gdkp3";
}; /* else if version == "7.2alpha4" then
"1ya9hr1wbx0hrx29q5zy2k51ml71k9mhqzqs7f505qr9s6jsfh0b" */
}
/* Use the CVS version for now since it contains many, many fixes
compared to 7.1 and even 7.2alpha4 (e.g., interception of
`pthread_exit', dated 2010-08-14, which fixes possible deadlocks
on GNU/Linux.) */
else fetchcvs {
cvsRoot = ":pserver:anonymous@bdwgc.cvs.sourceforge.net:/cvsroot/bdwgc";
module = "bdwgc";
date = "20110121";
sha256 = "00f7aed82fa02211db93692c24b74e15010aff545f97691c5e362432a7ae283a";
};
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin-pthread-dl.patch; ./cygwin-pthread-dl.patch;
@ -50,6 +65,15 @@ stdenv.mkDerivation ({
// //
(if cvs
then {
buildInputs = [ autoconf automake libtool ];
preConfigure = "autoreconf -vfi";
}
else { })
//
(if stdenv.system == "x86_64-darwin" (if stdenv.system == "x86_64-darwin"
# Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to be defined". # Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to be defined".
then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; } then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; }

9
pkgs/top-level/all-packages.nix
View File

@ -2769,7 +2769,14 @@ let
beecrypt = callPackage ../development/libraries/beecrypt { }; beecrypt = callPackage ../development/libraries/beecrypt { };
boehmgc = callPackage ../development/libraries/boehm-gc { }; boehmgc_7_1 = callPackage ../development/libraries/boehm-gc {
cvsVersion = false;
};
boehmgc_cvs = callPackage ../development/libraries/boehm-gc { };
# There are good reasons to use CVS instead of 7.1 or 7.2alpha4.
boehmgc = boehmgc_cvs;
boolstuff = callPackage ../development/libraries/boolstuff { }; boolstuff = callPackage ../development/libraries/boolstuff { };