diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-23 15:06:01 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 01:56:39 +0200 |
| commit | e1d57791548dc5330d20420ffa57461f1a612ed8 (patch) | |
| tree | b87e70eef0c2cfd834d7a030afbd40dd0dfc68b7 /pkgs/os-specific/linux/v4l-utils | |
| parent | e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3 (diff) | |
| download | nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar.gz nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar.bz2 nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar.lz nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar.xz nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.tar.zst nixpkgs-e1d57791548dc5330d20420ffa57461f1a612ed8.zip | |
v4l-utils: split to multiple outputs
That required setting localedir to fix cycle. Also do not patch shebangs globally.
Diffstat (limited to 'pkgs/os-specific/linux/v4l-utils')
| -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 a688f60492a..73db222d390 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; { |