diff options
| author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-07-04 17:07:30 +1000 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2013-07-12 16:26:45 +0200 |
| commit | 970346e2d1309335b789bd71161cc3c44bf3eabd (patch) | |
| tree | a87b1dae87b231f28c6bdc8647082a602ed7a783 /pkgs/development/libraries/libmad | |
| parent | 75730566521b2a40836a3f215732bf6a885b5982 (diff) | |
| download | nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar.gz nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar.bz2 nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar.lz nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar.xz nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.tar.zst nixpkgs-970346e2d1309335b789bd71161cc3c44bf3eabd.zip | |
libmad: fix build on darwin
* stop building with an i486 architecture Conflicts: pkgs/development/libraries/libmad/default.nix
Diffstat (limited to 'pkgs/development/libraries/libmad')
| -rw-r--r-- | pkgs/development/libraries/libmad/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 6e2e2c949cc..883ad072c7b 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; }; } |