diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-04-02 23:43:13 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-04-02 23:55:13 +0300 |
| commit | fda2590abb81795e0e5b90d4f5fd5f40f2ce3242 (patch) | |
| tree | c1405fd1ff1ee5bf6dfffe5cc23b8fb7008b4649 /pkgs/top-level | |
| parent | 74e2f482fe6821fab0c335f02690d8a48fbbdcbe (diff) | |
| download | nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar.gz nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar.bz2 nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar.lz nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar.xz nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.tar.zst nixlib-fda2590abb81795e0e5b90d4f5fd5f40f2ce3242.zip | |
v4l_utils: 1.10.1 -> 1.12.3
Add CLI utils-only mode. Use flags instead of null's. Move to Qt 5.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af43369ea563..1fb20dab34d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8844,10 +8844,7 @@ with pkgs; }; libv4l = lowPrio (v4l_utils.override { - alsaLib = null; - libX11 = null; - qt4 = null; - qt5 = null; + withUtils = false; }); libva = callPackage ../development/libraries/libva { }; @@ -12198,9 +12195,7 @@ with pkgs; systemd = null; }); - v4l_utils = callPackage ../os-specific/linux/v4l-utils { - qt5 = null; - }; + v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; |