diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
| commit | 552fd3d599851336aa21ef073d1f7836566e454f (patch) | |
| tree | b2ebdeaa32426d12e21020410a0eb1a12881f8f6 /pkgs/applications/audio/flac/default.nix | |
| parent | cc61d31902d67b94333f53a5ab5772330bbc21cc (diff) | |
| parent | 9dc35999602bc3bf2d7358a9ff79b9530e8d1975 (diff) | |
| download | nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.gz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.bz2 nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.lz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.xz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.zst nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/audio/flac/default.nix')
| -rw-r--r-- | pkgs/applications/audio/flac/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 8b31b36858d..95ab8244478 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,29 +1,24 @@ { stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { - name = "flac-1.2.1"; + name = "flac-1.3.0"; src = fetchurl { - url = mirror://sourceforge/flac/flac-1.2.1.tar.gz; - sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; + url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz"; + sha256 = "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs"; }; buildInputs = [ libogg ]; - patches = - [ # Fix for building on GCC 4.3. - (fetchurl { - url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch"; - sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; - }) - ]; + doCheck = true; # takes lots of time but will be run rarely (small build-time closure) enableParallelBuilding = true; outputs = [ "dev" "out" "bin" "doc" ]; meta = { - homepage = http://flac.sourceforge.net; + homepage = http://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; + platforms = stdenv.lib.platforms.all; }; } |