diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
| commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
| tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/os-specific/linux/v4l-utils | |
| parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
| download | nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip | |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/os-specific/linux/v4l-utils')
| -rw-r--r-- | pkgs/os-specific/linux/v4l-utils/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index c0e065b3b55..622bf4fbd5c 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper +{ stdenv, lib, fetchurl, pkgconfig, perl , libjpeg, udev , withUtils ? true , withGUI ? true, alsaLib, libX11, qtbase, mesa_glu @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postInstall = lib.optionalString (withUtils && withGUI) '' - wrapQtProgram $out/bin/qv4l2 - ''; - meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = http://linuxtv.org/projects.php; |