diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
| commit | 333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch) | |
| tree | 0f4757ddd2bb3d73b438eea85828d8e01c049583 /pkgs/development/libraries/libsndfile | |
| parent | bdbbfa0d4247e203ffe3171621b614374da05f70 (diff) | |
| parent | b809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff) | |
| download | nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2 nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip | |
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'pkgs/development/libraries/libsndfile')
| -rw-r--r-- | pkgs/development/libraries/libsndfile/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index b9aa9522564..5be8730ba01 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig +, Carbon +}: stdenv.mkDerivation rec { name = "libsndfile-1.0.25"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; }; - buildInputs = [ pkgconfig flac libogg libvorbis ]; + buildInputs = [ pkgconfig flac libogg libvorbis ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; enableParallelBuilding = true; |