From 564d96042afe4ddbe429017a4d0a9c280ba8c827 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 23 Apr 2009 09:55:52 +0000 Subject: [PATCH] * RPM barfs if you don't build its static libraries - probably a Makefile bug. svn path=/nixpkgs/branches/stdenv-updates/; revision=15262 --- pkgs/tools/package-management/rpm/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index dee5d81b5580..cc0a84114431 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -16,19 +16,14 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = "-L${elfutils}/lib"; - preConfigure = " + preConfigure = '' rm -rf zlib file sqlite - # Grrr, rpcgen can't find cpp. (NIXPKGS-48) - mkdir rpcgen - echo \"#! $shell\" > rpcgen/rpcgen - echo \"exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \\\"\\$@\\\"\" >> rpcgen/rpcgen - chmod +x rpcgen/rpcgen - export PATH=$(pwd)/rpcgen:$PATH - substituteInPlace ./installplatform --replace /usr/bin/env $(type -tp env) substituteInPlace Makefile.in --replace /var/tmp $(pwd)/dummy - "; + ''; + + dontDisableStatic = true; configureFlags = "--without-selinux --without-lua --without-python --without-perl";