public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Nix 1.0. 

svn path=/nixpkgs/trunk/; revision=34068
This commit is contained in:
Eelco Dolstra 2012-05-12 04:20:26 +00:00
parent 09ab016c6c
commit 8a5d68220a
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/tools/package-management/nix/default.nix
View File

@ -1,39 +1,62 @@
{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc, perlPackages
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.16"; name = "nix-1.0";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/build/565033/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2";
sha256 = "0648ed285f263a2cc5a704c4aee70ec5f0415c3749f540c2691a2a613492c7c3"; sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17";
}; };
buildNativeInputs = [ perl ]; buildNativeInputs = [ perl pkgconfig ];
buildInputs = [ curl openssl ];
buildInputs = [ curl openssl boehmgc sqlite ];
# Note: bzip2 is not passed as a build input, because the unpack phase
# would end up using the wrong bzip2 when cross-compiling.
# XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
postUnpack =
'' export CPATH="${bzip2}/include"
export LIBRARY_PATH="${bzip2}/lib"
'';
configureFlags = configureFlags =
'' ''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-bzip2=${bzip2} --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
--disable-init-state --disable-init-state
--enable-gc
CFLAGS=-O3 CXXFLAGS=-O3 CFLAGS=-O3 CXXFLAGS=-O3
''; '';
doInstallCheck = true;
crossAttrs = { crossAttrs = {
postUnpack =
'' export CPATH="${bzip2.hostDrv}/include"
export NIX_CROSS_LDFLAGS="-L${bzip2.hostDrv}/lib -rpath-link ${bzip2.hostDrv}/lib $NIX_CROSS_LDFLAGS"
'';
configureFlags = configureFlags =
'' ''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-bzip2=${bzip2.hostDrv} --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
--disable-init-state --disable-init-state
--enable-gc
CFLAGS=-O3 CXXFLAGS=-O3 CFLAGS=-O3 CXXFLAGS=-O3
''; '' + stdenv.lib.optionalString (
doCheck = false; stdenv.cross ? nix && stdenv.cross.nix ? system
) ''--with-system=${stdenv.cross.nix.system}'';
doInstallCheck = false;
}; };
#doCheck = true; enableParallelBuilding = true;
meta = { meta = {
description = "The Nix Deployment System"; description = "The Nix Deployment System";

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

@ -8565,17 +8565,14 @@ let
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
}; };
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
stdenv =
if stdenv.isDarwin
# When building the Perl bindings, `-no-cpp-precomp' is used.
then overrideGCC stdenv gccApple
else stdenv;
}; };
*/
nixSqlite = nixUnstable; nixUnstable = nixStable;
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {