From 4e59f0050147d22bfce3eb3a759047707a6b5958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 7 Mar 2010 22:46:29 +0000 Subject: [PATCH] I added again nasm as lrzip input. It is required in i686-linux at least. svn path=/nixpkgs/trunk/; revision=20467 --- pkgs/tools/compression/lrzip/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index e48c0ca52c2..0faa3e22c5c 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, lzo, bzip2}: +{stdenv, fetchurl, zlib, lzo, bzip2, nasm}: stdenv.mkDerivation rec { name = "lrzip-0.44"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-isystem ${zlib}/include"; - buildInputs = [ zlib lzo bzip2 ]; + buildInputs = [ zlib lzo bzip2 nasm ]; meta = { homepage = http://ck.kolivas.org/apps/lrzip/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cf74114a03..9017fb40278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,7 +1015,7 @@ let }; lrzip = import ../tools/compression/lrzip { - inherit fetchurl stdenv zlib lzo bzip2; + inherit fetchurl stdenv zlib lzo bzip2 nasm; }; lsh = import ../tools/networking/lsh {