diff options
author | Christoph Hrdinka <c.github@hrdinka.at> | 2016-03-12 18:28:27 +0100 |
---|---|---|
committer | Christoph Hrdinka <c.github@hrdinka.at> | 2016-03-12 18:28:27 +0100 |
commit | e06570fe6b41fb0d00e5ce1a105414f1e1185226 (patch) | |
tree | 9880518166d9b93b07ceda8aaeb4ff1558c90d74 /pkgs/applications/misc | |
parent | a25d2a74664bd2519caf9141450efe85a96d63d5 (diff) | |
parent | 29a90dbc2bea410a80b7f6c1f00745e8683de5a5 (diff) | |
download | nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar.gz nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar.bz2 nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar.lz nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar.xz nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.tar.zst nixpkgs-e06570fe6b41fb0d00e5ce1a105414f1e1185226.zip |
Merge pull request #13847 from devhell/mediainfo
{lib}mediainfo{-gui}: 0.7.82 -> 0.7.83
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/mediainfo-gui/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/misc/mediainfo/default.nix | 10 |
2 files changed, 16 insertions, 15 deletions
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index ffb4c147c77..83130164fd9 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK +, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; + sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; - preConfigure = "sh autogen.sh"; - - meta = { + meta = with stdenv.lib; { description = "Supplies technical and tag information about a video or audio file (GUI version)"; longDescription = '' MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5d953fed53a..cf1a4ce8280 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; + sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen libmediainfo zlib ]; sourceRoot = "./MediaInfo/Project/GNU/CLI/"; configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; - preConfigure = "sh autogen.sh"; meta = with stdenv.lib; { description = "Supplies technical and tag information about a video or audio file"; |