diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-21 17:05:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-21 17:05:30 +0200 |
| commit | 10cb4a8cf253744e4d200bd0befaff2907097574 (patch) | |
| tree | 4383356165c7f54dffaf3a852f54dd814101aaa7 /pkgs/development/libraries/libsamplerate | |
| parent | 9555f3ba068f2deeb433ac7989775f8e2c3494a1 (diff) | |
| parent | 77b9f286584e08f441357dba0e69676f0e9c4abc (diff) | |
| download | nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar.gz nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar.bz2 nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar.lz nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar.xz nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.tar.zst nixpkgs-10cb4a8cf253744e4d200bd0befaff2907097574.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/libsamplerate')
| -rw-r--r-- | pkgs/development/libraries/libsamplerate/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 0e2f042104d..b70fddb9671 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -17,14 +17,19 @@ stdenv.mkDerivation rec { outputs = [ "dev" "bin" "out" ]; - meta = { + # 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"; + + meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; - homepage = http://www.mega-nerd.com/SRC/index.html; + homepage = http://www.mega-nerd.com/SRC/index.html; # you can choose one of the following licenses: - license = [ - "GPL" - # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf - "libsamplerate Commercial Use License" - ]; + # GPL or a commercial-use license (available at + # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf) + licenses = with licenses; [ gpl3.shortName unfree ]; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; } |