diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 06:57:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 06:57:40 +0200 |
| commit | 8752ff225446422b902d9f88d6f75f9928d4eb34 (patch) | |
| tree | 0af14d84f2e4ab40436626691fd151308e9aea7d /pkgs/os-specific | |
| parent | bd61f91fd10ee730c66b721876c728e62f23691b (diff) | |
| parent | 2eb7541b1acfad498b3367e2ecc0ebb4c5233b12 (diff) | |
zbar: clean up (#68389)
zbar: clean up
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 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; { |