public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'staging' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
This commit is contained in:
Vladimír Čunát
2014-08-23 16:04:53 +02:00
parent db83d9a35b 084626deec
commit 96cec2a7bd
6628 changed files with 165219 additions and 65293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libvorbis/default.nix
+15 -6
View File
@@ -1,19 +1,28 @@
{ stdenv, fetchurl, libogg, xz }:
{ stdenv, fetchurl, libogg, pkgconfig }:
stdenv.mkDerivation rec {
name = "libvorbis-1.3.3";
let
name = "libvorbis-1.3.4";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43";
sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
};
nativeBuildInputs = [ xz ];
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ libogg ];
outputs = [ "dev" "out" "doc" ];
meta = {
doCheck = true;
meta = with stdenv.lib; {
homepage = http://xiph.org/vorbis/;
license = licenses.bsd3;
maintainers = [ maintainers.emery ];
platforms = platforms.all;
};
}