From 222e41519e276258adb0a234f1a7310962bcfcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 5 May 2010 20:38:13 +0000
Subject: [PATCH] Making lame compile with assembly optimization for i386

svn path=/nixpkgs/trunk/; revision=21620
---
 pkgs/applications/audio/lame/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix
index f9c0e151c897..816afa0e24fb 100644
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation {
   name = "lame-3.98.2";
@@ -7,6 +7,10 @@ stdenv.mkDerivation {
     sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1";
   };
 
+  buildInputs = [ nasm ];
+
+  configureFlags = [ "--enable-nasm" ];
+
   # Either disable static, or fix the rpath of 'lame' for it to point
   # properly to the libmp3lame shared object.
   dontDisableStatic = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fce763c743ae..22d3139835b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7861,7 +7861,7 @@ let
   };
 
   lame = import ../applications/audio/lame {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv nasm;
   };
 
   ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix {