From 0b853b767ab19ac175c41b7ad42302a5364c8fa6 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:35:52 -0500 Subject: [PATCH 1/2] libebml: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/libebml/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index a2065111190..818177ff49d 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -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; }; } From af2d875865f6b6cb1c7aa613dba9d84b1a4a711e Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:46:13 -0500 Subject: [PATCH 2/2] libmatroska: Fix Darwin build --- pkgs/development/libraries/libmatroska/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 67b9e728955..b4032f3c22d 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -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; }; }