From 5dff3c4b68e163ae73a279b24fae77bb0c31ffad Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 1 May 2016 18:08:58 +0000 Subject: [PATCH] rpm: stop build from trying to create /var/tmp, which breaks in sandboxed builds --- pkgs/tools/package-management/rpm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6c2c9a350adc..d9cf24f6e519 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "rpm-4.12.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp"; }; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive ]; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable} + + substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com";