mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge pull request #6989 from spwhitt/libmatroska
libmatroska: Fix Darwin build
This commit is contained in:
commit
e73b4f42a3
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libebml-1.3.0";
|
||||
name = "libebml-1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
|
||||
sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43";
|
||||
sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r";
|
||||
};
|
||||
|
||||
configurePhase = "cd make/linux";
|
||||
makeFlags = "prefix=$(out)";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extensible Binary Meta Language library";
|
||||
license = licenses.lgpl21;
|
||||
homepage = http://dl.matroska.org/downloads/libebml/;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
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 ];
|
||||
|
||||
meta = {
|
||||
description = "Matroska library";
|
||||
homepage = http://dl.matroska.org/downloads/libmatroska;
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to parse Matroska files";
|
||||
homepage = http://matroska.org/;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user