1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00

NIX: Fix chrooted builds, passing down package lists explicitly.

This commit is contained in:
Petr Rockai 2013-07-23 11:02:22 +02:00 committed by Petr Rockai
parent a0d3a7d569
commit 9c927f7b27

View File

@ -68,14 +68,14 @@ let
'') { inherit fedora; };
update = version: arch: repodata: orig: orig // (import (pkgs.runCommand "updates-fedora.nix" {} ''
sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
(echo 'fetchurl: { packagesLists = [ "${orig.packagesList}" ('
(echo 'fetchurl: orig: { packagesLists = [ orig.packagesList ('
echo "fetchurl { "
echo " url = \"${fedora_update_url version arch}/repodata/$sha-primary.xml.gz\";"
echo " sha256 = \"$sha\";"
echo '} ) ]; urlPrefixes = [ "${orig.urlPrefix}" "${fedora_update_url version arch}" ]; }'
echo '} ) ]; urlPrefixes = [ orig.urlPrefix "${fedora_update_url version arch}" ]; }'
) > $out
echo built $out 1>&2
'')) pkgs.fetchurl;
'')) pkgs.fetchurl orig;
in {
rawhidex86_64 = rawhide "rawhide" "x86_64" rawhide64;
rawhidei386 = rawhide "rawhide" "i386" rawhide32;