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

Merge pull request #6989 from spwhitt/libmatroska

Browse Source 
libmatroska: Fix Darwin build
This commit is contained in:
William A. Kennington III 2015-03-25 21:43:56 -07:00
commit e73b4f42a3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libebml/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libebml-1.3.0"; name = "libebml-1.3.1";
src = fetchurl { src = fetchurl {
url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r";
}; };
configurePhase = "cd make/linux"; meta = with stdenv.lib; {
makeFlags = "prefix=$(out)";
meta = {
description = "Extensible Binary Meta Language library"; description = "Extensible Binary Meta Language library";
license = licenses.lgpl21;
homepage = http://dl.matroska.org/downloads/libebml/; homepage = http://dl.matroska.org/downloads/libebml/;
maintainers = [ maintainers.spwhitt ];
platforms = platforms.unix;
}; };
} }

12
pkgs/development/libraries/libmatroska/default.nix
View File

@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
}; };
configurePhase = "cd make/linux"; configurePhase = "cd make/linux";
makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"; makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"
+ stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++";
propagatedBuildInputs = [ libebml ]; propagatedBuildInputs = [ libebml ];
meta = { meta = with stdenv.lib; {
description = "Matroska library"; description = "A library to parse Matroska files";
homepage = http://dl.matroska.org/downloads/libmatroska; homepage = http://matroska.org/;
license = licenses.lgpl21;
maintainers = [ maintainers.spwhitt ];
platforms = platforms.unix;
}; };
} }