ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-12 07:30:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge #330270: libcamera: 0.3.0 -> 0.3.1

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-08-22 12:00:52 +02:00
commit 9f8ee91805
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/by-name/li/libcamera/package.nix
View File

@ -19,18 +19,18 @@
, withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust
, lttng-ust # withTracing
, withQcam ? false
, qt5 # withQcam
, qt6 # withQcam
, libtiff # withQcam
}:
stdenv.mkDerivation rec {
pname = "libcamera";
version = "0.3.0";
version = "0.3.1";
src = fetchgit {
url = "https://git.libcamera.org/libcamera/libcamera.git";
rev = "v${version}";
hash = "sha256-eCtOtdjpwn0S56ZyRVdG1QCBk1KGPh8YTXD50xev7Bc=";
hash = "sha256-vB7dxBDG0y8YvG/2vCgrhyBJmumGG66Vl7yZwprxj5c=";
};
outputs = [ "out" "dev" ];
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
gtest
] ++ lib.optionals withTracing [ lttng-ust ]
++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ];
++ lib.optionals withQcam [ libtiff qt6.qtbase qt6.qttools ];
nativeBuildInputs = [
meson
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
graphviz
doxygen
openssl
] ++ lib.optional withQcam qt5.wrapQtAppsHook;
] ++ lib.optional withQcam qt6.wrapQtAppsHook;
mesonFlags = [
"-Dv4l2=true"