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

qt5: remove makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel
2017-05-17 14:26:11 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/v4l-utils/default.nix
View File

@@ -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;