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

libv4l: disable building Qt (#67134)

Browse Source 
Since we added wrapQTAppHooks to qt5.mkDerivation, it pollutes the closure
of everything it touches even when package is not building with Qt support.
We had to revert to the standard deriver to avoid this.
This commit is contained in:
Jan Tojnar 2019-08-21 02:58:13 +02:00 committed by worldofpeace
parent c5c47203dc
commit e6e03ba58d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,16 @@
{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation
{ stdenv, lib, fetchurl, pkgconfig, perl
, libjpeg, udev
, withUtils ? true
, withGUI ? true, alsaLib, libX11, qtbase, libGLU
, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook
}:
# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
mkDerivation rec {
let
withQt = withUtils && withGUI;
# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
in stdenv.mkDerivation rec {
pname = "v4l-utils";
version = "1.16.6";
@ -29,13 +33,13 @@ mkDerivation rec {
ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
'';
nativeBuildInputs = [ pkgconfig perl ];
nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook;
buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ];
buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ];
propagatedBuildInputs = [ libjpeg ];
NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11";
NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11";
postPatch = ''
patchShebangs .