From 970346e2d1309335b789bd71161cc3c44bf3eabd Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 17:07:30 +1000 Subject: [PATCH] libmad: fix build on darwin * stop building with an i486 architecture Conflicts: pkgs/development/libraries/libmad/default.nix --- pkgs/development/libraries/libmad/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 6e2e2c949cca..883ad072c7b9 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, autoconf}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libmad-0.15.1b"; src = fetchurl { - url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz; + url = "mirror://sourceforge/mad/${name}.tar.gz"; sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; @@ -16,10 +16,13 @@ stdenv.mkDerivation { preConfigure = '' autoconf substituteInPlace configure --replace "-fforce-mem" "" + substituteInPlace configure --replace "arch=\"-march=i486\"" "" ''; - meta = { - homepage = http://sourceforge.net/projects/mad/; + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; }