From 062aaf4d907d6348e0f15c97e308b5fd909f9650 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Sep 2024 09:40:07 +0800
Subject: [PATCH] entangle: move to by-name; nixfmt

---
 .../en/entangle/package.nix}                  | 158 +++++++++---------
 pkgs/top-level/all-packages.nix               |   4 -
 2 files changed, 80 insertions(+), 82 deletions(-)
 rename pkgs/{applications/video/entangle/default.nix => by-name/en/entangle/package.nix} (59%)

diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/by-name/en/entangle/package.nix
similarity index 59%
rename from pkgs/applications/video/entangle/default.nix
rename to pkgs/by-name/en/entangle/package.nix
index c06513a0fc0c..1a606e7a5fe1 100644
--- a/pkgs/applications/video/entangle/default.nix
+++ b/pkgs/by-name/en/entangle/package.nix
@@ -1,53 +1,53 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchpatch
-, itstool
-, libxml2
-, meson
-, ninja
-, perl
-, python3
-, pkgconf
-, wrapGAppsHook3
-, at-spi2-core
-, dbus
-, elfutils
-, libepoxy
-, gexiv2
-, glib
-, gobject-introspection
-, gst-plugins-base
-, gstreamer
-, gtk3
-, lcms2
-, libdatrie
-, libgphoto2
-, libgudev
-, libpeas
-, libraw
-, libselinux
-, libsepol
-, libthai
-, libunwind
-, libxkbcommon
-, orc
-, pcre
-, pcre2
-, udev
-, util-linux
-, xorg
-, zstd
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchpatch,
+  itstool,
+  libxml2,
+  meson,
+  ninja,
+  perl,
+  python3,
+  pkgconf,
+  wrapGAppsHook3,
+  at-spi2-core,
+  dbus,
+  elfutils,
+  libepoxy,
+  gexiv2,
+  glib,
+  gobject-introspection,
+  gst_all_1,
+  gtk3,
+  lcms2,
+  libdatrie,
+  libgphoto2,
+  libgudev,
+  libpeas,
+  libraw,
+  libselinux,
+  libsepol,
+  libthai,
+  libunwind,
+  libxkbcommon,
+  orc,
+  pcre,
+  pcre2,
+  udev,
+  util-linux,
+  xorg,
+  zstd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "entangle";
   version = "3.0";
 
   src = fetchFromGitLab {
     owner = "entangle";
     repo = "entangle";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
   };
 
@@ -73,37 +73,39 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs = [
-    at-spi2-core
-    dbus
-    libepoxy
-    elfutils
-    gexiv2
-    glib
-    gst-plugins-base
-    gstreamer
-    gtk3
-    lcms2
-    libdatrie
-    libgphoto2
-    libgudev
-    libpeas
-    libraw
-    libselinux
-    libsepol
-    libthai
-    libunwind
-    libxkbcommon
-    orc
-    pcre # required by libselinux before we USE_PCRE2
-    pcre2 # required by glib-2.0
-    udev
-    util-linux
-    zstd
-  ] ++ (with xorg; [
-    libXdmcp
-    libXtst
-  ]);
+  buildInputs =
+    [
+      at-spi2-core
+      dbus
+      libepoxy
+      elfutils
+      gexiv2
+      glib
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      gtk3
+      lcms2
+      libdatrie
+      libgphoto2
+      libgudev
+      libpeas
+      libraw
+      libselinux
+      libsepol
+      libthai
+      libunwind
+      libxkbcommon
+      orc
+      pcre # required by libselinux before we USE_PCRE2
+      pcre2 # required by glib-2.0
+      udev
+      util-linux
+      zstd
+    ]
+    ++ (with xorg; [
+      libXdmcp
+      libXtst
+    ]);
 
   # Disable building of doc/reference since it requires network connection to render XML to HTML
   # Patch build script shebangs
@@ -120,7 +122,7 @@ stdenv.mkDerivation rec {
       --replace "Exec=entangle" "Exec=$out/bin/entangle"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tethered camera control and capture";
     longDescription = ''
       Entangle uses GTK and libgphoto2 to provide a graphical interface
@@ -130,9 +132,9 @@ stdenv.mkDerivation rec {
       This app can also serve as a camera app for mobile devices.
     '';
     homepage = "https://gitlab.com/entangle/entangle";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ShamrockLee ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
     mainProgram = "entangle";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c5985bd5c9..a54dc6632e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29193,10 +29193,6 @@ with pkgs;
 
   enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
 
-  entangle = callPackage ../applications/video/entangle {
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-  };
-
   eolie = callPackage ../applications/networking/browsers/eolie { };
 
   eos-installer = callPackage ../applications/misc/eos-installer { };