diff options
author | volth <volth@volth.com> | 2018-10-12 22:56:15 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-10-12 22:56:15 +0000 |
commit | c0fed1ba7740070cb20454d6aa77f087751a2a2b (patch) | |
tree | ed60b74a1d698af2234e6bd537f5af3ab836b2ae /pkgs/applications/video | |
parent | ef93155f60284e7cd694ded81bd15f07997575bc (diff) | |
download | nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.gz nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.bz2 nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.lz nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.xz nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.zst nixlib-c0fed1ba7740070cb20454d6aa77f087751a2a2b.zip |
perlXMLParser -> perlPackages.XMLParser
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/kino/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/video/wxcam/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/xvidcap/default.nix | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 6c473e2d8dca..d6404a82bc34 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -51,7 +51,7 @@ #AMR-WB IF2 support no { stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext +, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -64,7 +64,8 @@ stdenv.mkDerivation { }; buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages + pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages + ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--enable-local-ffmpeg=no" ]; diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 24e99d78c486..64fcf0ba04a5 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -4,7 +4,7 @@ , libX11, libXv, libSM , gtk, libglade , wxGTK -, perlXMLParser +, perlPackages , xvidcore , mjpegtools , alsaLib @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" - ''; - + ''; + meta = with stdenv.lib; { - description = "An open-source, wxGTK-based webcam app for Linux"; + description = "An open-source, wxGTK-based webcam app for Linux"; longDescription = '' wxCam is a webcam application for linux. It supports video recording (avi uncompressed and Xvid formats), snapshot taking, and some special diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 663f89b325a2..6e07fbb105b6 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2 +{ stdenv, fetchurl, perlPackages, pkgconfig, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: stdenv.mkDerivation { name = "xvidcap-1.1.7"; - + src = fetchurl { url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; @@ -14,14 +14,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl perlXMLParser gtk2 scrollkeeper + gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 - ]; + ] ++ (with perlPackages; [ perl XMLParser ]); # !!! don't know why this is necessary NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "Screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; license = stdenv.lib.licenses.gpl2; |