tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
darwin: libsndfile: add missing darwin deps
Stéphane Jourdois
10 years ago
eed34952
00da7807
+8
-3
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
libsndfile
default.nix
top-level
all-packages.nix
+5
-2
pkgs/development/libraries/libsndfile/default.nix
···
1
1
-
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
1
1
+
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
2
2
+
, Carbon
3
3
+
}:
2
4
3
5
stdenv.mkDerivation rec {
4
6
name = "libsndfile-1.0.25";
···
8
10
sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
9
11
};
10
12
11
11
-
buildInputs = [ pkgconfig flac libogg libvorbis ];
13
13
+
buildInputs = [ pkgconfig flac libogg libvorbis ]
14
14
+
++ stdenv.lib.optional stdenv.isDarwin Carbon;
12
15
13
16
# need headers from the Carbon.framework in /System/Library/Frameworks to
14
17
# compile this on darwin -- not sure how to handle
+3
-1
pkgs/top-level/all-packages.nix
···
7433
7433
# To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
7434
7434
libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
7435
7435
7436
7436
-
libsndfile = callPackage ../development/libraries/libsndfile { };
7436
7436
+
libsndfile = callPackage ../development/libraries/libsndfile {
7437
7437
+
inherit (darwin.apple_sdk.frameworks) Carbon;
7438
7438
+
};
7437
7439
7438
7440
libsodium = callPackage ../development/libraries/libsodium { };
7439
7441