diff options
| -rw-r--r-- | pkgs/applications/misc/mediainfo-gui/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/applications/misc/mediainfo/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmediainfo/default.nix | 18 |
3 files changed, 25 insertions, 24 deletions
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index ffb4c147c776..83130164fd99 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 5d953fed53a9..cf1a4ce82800 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"; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 2bc18a5a61da..b3d76b1c931f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1mqmk1q2phwqwrak54jc9hfwjllhhr4nqyigisrh9rcvd6wx6r86"; + sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; configureFlags = [ "--enable-shared" ]; - preConfigure = "sh autogen.sh"; postInstall = '' install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" ''; - meta = { + meta = with stdenv.lib; { description = "Shared library for mediainfo"; homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.devhell ]; }; } |