public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v4l-utils: align attr with pkg name

Browse Source
This commit is contained in:
Bjørn Forsman 2019-08-07 20:38:12 +02:00
parent f6763cc130
commit a920c2aabd
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/qstopmotion/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 { stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre , gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
, qwt, extra-cmake-modules }: , qwt, extra-cmake-modules }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
}; };
buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
qwt qtquickcontrols qtimageformats qtxmlpatterns ]; qwt qtquickcontrols qtimageformats qtxmlpatterns ];
nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja

4
pkgs/development/libraries/unicap/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }: { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libunicap-${version}"; name = "libunicap-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
}; };
buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ]; buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ];
patches = [ patches = [
# Debian has a patch that fixes the build. # Debian has a patch that fixes the build.

1
pkgs/top-level/aliases.nix
View File

@ -362,6 +362,7 @@ mapAliases ({
ucsFonts = ucs-fonts; # added 2016-07-15 ucsFonts = ucs-fonts; # added 2016-07-15
ultrastardx-beta = ultrastardx; # added 2017-08-12 ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10 usb_modeswitch = usb-modeswitch; # added 2016-05-10
v4l_utils = v4l-utils; # added 2019-08-07
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24 virtviewer = virt-viewer; # added 2015-12-24

4
pkgs/top-level/all-packages.nix
View File

@ -12281,7 +12281,7 @@ in
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
}; };
libv4l = lowPrio (v4l_utils.override { libv4l = lowPrio (v4l-utils.override {
withUtils = false; withUtils = false;
}); });
@ -16325,7 +16325,7 @@ in
systemd = null; systemd = null;
}) else utillinux; }) else utillinux;
v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
vndr = callPackage ../development/tools/vndr { }; vndr = callPackage ../development/tools/vndr { };