about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-01-30 11:06:25 +0200
committerFlorian Klink <flokli@flokli.de>2024-01-30 11:24:59 +0200
commitd6ee968663f3c206f1edf45a4ab5b76bc2f518ee (patch)
tree9ab2dfc54135f859c1566a027815fafdc531330d
parent9ec316831f68bdb51691e37b3861dcbe006ad797 (diff)
libcamera: move to pkgs/by-name
The CI check complains about a new attribute introduced that's not using
the by-name pattern, even though it's using the same .nix file.

It seems using callPackage ../by-name/… from toplevel for the
alternative toplevel attribute seems to be others do this, so using the
same pattern here.
-rw-r--r--pkgs/by-name/li/libcamera/package.nix (renamed from pkgs/development/libraries/libcamera/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/by-name/li/libcamera/package.nix
index a6a0fe8fa7c35..a6a0fe8fa7c35 100644
--- a/pkgs/development/libraries/libcamera/default.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd9c57c583160..ddcbd4bcd94d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22463,9 +22463,7 @@ with pkgs;
 
   libcacard = callPackage ../development/libraries/libcacard { };
 
-  libcamera = callPackage ../development/libraries/libcamera { };
-
-  libcamera-qcam = callPackage ../development/libraries/libcamera { withQcam = true; };
+  libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
     inherit (darwin.apple_sdk.frameworks) Carbon CoreServices AppKit;