diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-10-07 17:56:32 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-10-07 17:56:32 +0200 |
commit | 949395239d0dae40eebaf686f9cacfcc6a0bc9b1 (patch) | |
tree | e4052d7ab896d5e8bb1578ad410c7dd19c23f9a4 /pkgs/os-specific | |
parent | c922d882991b6ddf94511547f8ef8a3937c64490 (diff) | |
parent | 58eac16818e8ac7a57f855dba7fbf8d0f70bb900 (diff) |
Merge branch 'staging-19.09' into release-19.09
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/v4l-utils/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index a688f60492a83..73db222d390c0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -19,14 +19,14 @@ in stdenv.mkDerivation rec { sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; - configureFlags = - if withUtils then [ - "--with-udevdir=${placeholder "out"}/lib/udev" - ] else [ - "--disable-v4l-utils" - ]; + configureFlags = (if withUtils then [ + "--with-localedir=${placeholder "lib"}/share/locale" + "--with-udevdir=${placeholder "out"}/lib/udev" + ] else [ + "--disable-v4l-utils" + ]); postFixup = '' # Create symlink for V4l1 compatibility @@ -39,10 +39,8 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg ]; - NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11"; - postPatch = '' - patchShebangs . + patchShebangs utils/cec-ctl/msg2ctl.pl ''; meta = with stdenv.lib; { |