diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-05 20:38:13 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-05 20:38:13 +0000 |
commit | 222e41519e276258adb0a234f1a7310962bcfcf0 (patch) | |
tree | cc4f93749116cc1e670ed0f73123aacac10cddb8 /pkgs | |
parent | 96f2d289bcbe75569e63baf9c07f73a195b5558e (diff) | |
download | nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar.gz nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar.bz2 nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar.lz nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar.xz nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.tar.zst nixlib-222e41519e276258adb0a234f1a7310962bcfcf0.zip |
Making lame compile with assembly optimization for i386
svn path=/nixpkgs/trunk/; revision=21620
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/lame/default.nix | 6 | ||||
-rw-r--r-- | 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 { |