diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-05-22 14:30:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-05-22 14:30:12 +0000 |
| commit | 7962af0fe5dc3d8c6a5cde338972d08777e65061 (patch) | |
| tree | f5ab253a0852e0a9f30a681e5fb77db4904f7242 /pkgs/top-level | |
| parent | 21bd78667aae101d20c5f20b208a69b1fc8548a3 (diff) | |
| download | nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar.gz nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar.bz2 nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar.lz nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar.xz nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.tar.zst nixlib-7962af0fe5dc3d8c6a5cde338972d08777e65061.zip | |
Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style,
and it's used to build either libv4l or the utils (with qt4). svn path=/nixpkgs/trunk/; revision=34208
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b7cd95fae0..52c63885f7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4184,7 +4184,9 @@ let libunwind = callPackage ../development/libraries/libunwind { }; - libv4l = callPackage ../development/libraries/libv4l { }; + libv4l = v4l_utils.override { + withQt4 = false; + }; libva = callPackage ../development/libraries/libva { }; @@ -6025,7 +6027,9 @@ let inherit ncurses perl; }; - v4l_utils = callPackage ../os-specific/linux/v4l-utils {}; + v4l_utils = callPackage ../os-specific/linux/v4l-utils { + withQt4 = true; + }; windows = rec { w32api = callPackage ../os-specific/windows/w32api { |