Fix 32-bit RPM/Deb builds

http://hydra.nixos.org/build/49130529
This commit is contained in:
Eelco Dolstra 2017-02-22 13:54:11 +01:00
parent 8b1b5f9a12
commit b8ce649a35
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -278,10 +278,10 @@ let
{ extraPackages = { extraPackages =
[ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ] [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ]
++ extraPackages; }; ++ extraPackages; };
memSize = 8192; #memSize = 8192;
meta.schedulingPriority = 50; meta.schedulingPriority = 50;
postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck"; postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck";
enableParallelBuilding = true; #enableParallelBuilding = true;
}; };
@ -300,7 +300,7 @@ let
{ extraPackages = { extraPackages =
[ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" "libcurl-dev" "libcurl3-nss" "libssl-dev" "liblzma-dev" ] [ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" "libcurl-dev" "libcurl3-nss" "libssl-dev" "liblzma-dev" ]
++ extraPackages; }; ++ extraPackages; };
memSize = 8192; #memSize = 8192;
meta.schedulingPriority = 50; meta.schedulingPriority = 50;
postInstall = "make installcheck"; postInstall = "make installcheck";
configureFlags = "--sysconfdir=/etc"; configureFlags = "--sysconfdir=/etc";
@ -309,7 +309,7 @@ let
++ extraDebPackages; ++ extraDebPackages;
debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
doInstallCheck = true; doInstallCheck = true;
enableParallelBuilding = true; #enableParallelBuilding = true;
}; };