public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style,

Browse Source 
and it's used to build either libv4l or the utils (with qt4).


svn path=/nixpkgs/trunk/; revision=34208
This commit is contained in:
Lluís Batlle i Rossell 2012-05-22 14:30:12 +00:00
parent 21bd78667a
commit 7962af0fe5
3 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libv4l/default.nix
View File

@ -1,10 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libv4l-0.6.2";
src = fetchurl {
url = http://people.atrpms.net/~hdegoede/libv4l-0.6.1.tar.gz;
sha256 = "1grbyb9vsdlp6yx4inmazgp5g0jxga8wbl3h8dv6vlfh5hckxf9n";
};
installPhase = "make PREFIX=$out install";
}

68
pkgs/os-specific/linux/v4l-utils/default.nix
View File

@ -1,50 +1,34 @@
x@{builderDefsPackage {stdenv, fetchurl, which, libjpeg
, libv4l, libjpeg, qt4 , withQt4 ? false, qt4 ? null}:
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x) assert withQt4 -> qt4 != null;
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { stdenv.mkDerivation rec {
baseName="v4l-utils"; name = "v4l-utils-0.8.8";
version="0.8.5";
name="${baseName}-${version}"; src = fetchurl {
url="http://www.linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
hash="0k2rkra8lyimj6bwm8khq6xrhjdy67d09blxa6brnj7kpa7q81f2"; sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4;
inherit buildInputs;
/* doConfigure should be removed if not needed */ # The keytable wants to touch /etc files and udev scripts in /lib.
phaseNames = ["doUnpack" "doMakeInstall"]; # I skip it.
patchPhase = ''
sed -i s/keytable// utils/Makefile
'';
makeFlags = [''PREFIX="" DESTDIR="$out"'']; installPhase = ''
make PREFIX=$out install
'';
meta = { meta = {
description = "Video-4-Linux utilities"; homepage = http://linuxtv.org/projects.php;
maintainers = with a.lib.maintainers; description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device";
[ # (The libs are of LGPLv2.1+, some other pieces are GPL)
raskin license = "free";
]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with a.lib.platforms; platforms = with stdenv.lib.platforms; linux;
linux;
license = a.lib.licenses.gpl2;
}; };
passthru = { }
updateInfo = {
downloadPage = "http://www.linuxtv.org/downloads/v4l-utils/";
};
};
}) x

8
pkgs/top-level/all-packages.nix
View File

@ -4184,7 +4184,9 @@ let
libunwind = callPackage ../development/libraries/libunwind { }; libunwind = callPackage ../development/libraries/libunwind { };
libv4l = callPackage ../development/libraries/libv4l { }; libv4l = v4l_utils.override {
withQt4 = false;
};
libva = callPackage ../development/libraries/libva { }; libva = callPackage ../development/libraries/libva { };
@ -6025,7 +6027,9 @@ let
inherit ncurses perl; inherit ncurses perl;
}; };
v4l_utils = callPackage ../os-specific/linux/v4l-utils {}; v4l_utils = callPackage ../os-specific/linux/v4l-utils {
withQt4 = true;
};
windows = rec { windows = rec {
w32api = callPackage ../os-specific/windows/w32api { w32api = callPackage ../os-specific/windows/w32api {