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/libsndfile/default.nix
+9 -4
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
stdenv.mkDerivation rec {
name = "libsndfile-1.0.23";
name = "libsndfile-1.0.25";
src = fetchurl {
url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal";
sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
};
buildInputs = [ pkgconfig flac libogg libvorbis ];
@@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
# need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
"-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
''
NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
'';
# Needed on Darwin.
NIX_CFLAGS_LINK = "-logg -lvorbis";
meta = with stdenv.lib; {
description = "A C library for reading and writing files containing sampled sound";