From 82ab4c61058b8d823920f8316606222fa92c0757 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Nov 2008 18:58:37 +0000 Subject: [PATCH] * buildRPM: Set the %_topdir variable to a known location, otherwise we run into trouble on Fedora 10 (RPM 4.6), where the default is no longer /usr/src/something but $HOME/something. svn path=/nixpkgs/trunk/; revision=13466 --- pkgs/build-support/vm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 076e7fa9a36..33de9804237 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -461,6 +461,14 @@ rec { srcName="$strippedName" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root + export HOME=/tmp/home + mkdir $HOME + + rpmout=/tmp/rpmout + mkdir $rpmout $rpmout/SPECS $rpmout/BUILD $rpmout/RPMS $rpmout/SRPMS + + echo "%_topdir $rpmout" >> $HOME/.rpmmacros + rpmbuild -vv -ta "$srcName" eval "$postBuild" @@ -470,7 +478,7 @@ rec { eval "$preInstall" ensureDir $out/$outDir - find /usr/src -name "*.rpm" -exec cp {} $out/$outDir \; + find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do header "Generated RPM/SRPM: $i"