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

rpm: add lua support and a few propagatedBuildInputs

Browse Source 
It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.

The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
This commit is contained in:
Dan Peebles 2016-04-29 02:29:02 +00:00
parent c85de1b7e2
commit fbbf910e23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/package-management/rpm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python }:
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig }:
stdenv.mkDerivation rec {
name = "rpm-4.12.0";
@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
};
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss popt db xz python ];
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
propagatedBuildInputs = [ popt nss db bzip2 libarchive ];
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
'';
configureFlags = "--with-external-db --without-lua --enable-python";
configureFlags = "--with-external-db --with-lua --enable-python";
meta = with stdenv.lib; {
homepage = http://www.rpm.org/;