From e0a2224f1e2b06dd118906dfce564b6130eb2a95 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Apr 2016 12:33:54 -0500 Subject: v4l-utils: multiple outputs --- pkgs/os-specific/linux/v4l-utils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 17b21f92c171..476f3ffcac6c 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn"; }; + outputs = [ "dev" "out" ]; + configureFlags = [ "--enable-libv4l" ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ @@ -36,15 +38,15 @@ stdenv.mkDerivation rec { "--disable-qv4l2" ]); - postInstall = '' + postFixup = '' # Create symlink for V4l1 compatibility - ln -s $out/include/libv4l1-videodev.h $out/include/videodev.h + ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib libX11 qt4 qt5 ]; - + propagatedBuildInputs = [ libjpeg ]; meta = with stdenv.lib; { -- cgit 1.4.1