From 562172f0bad1130dcb380330ec3697c36401a843 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Apr 2025 20:51:11 +0200
Subject: [PATCH] dleyna-core: 0.7.0 -> 0.8.3

closes #399076
---
 pkgs/by-name/dl/dleyna-core/package.nix   | 53 ---------------------
 pkgs/by-name/dl/dleyna-core/setup-hook.sh |  8 ----
 pkgs/by-name/dl/dleyna/package.nix        | 57 +++++++++++++++++++++++
 pkgs/top-level/aliases.nix                |  1 +
 4 files changed, 58 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/dl/dleyna-core/package.nix
 delete mode 100644 pkgs/by-name/dl/dleyna-core/setup-hook.sh
 create mode 100644 pkgs/by-name/dl/dleyna/package.nix

diff --git a/pkgs/by-name/dl/dleyna-core/package.nix b/pkgs/by-name/dl/dleyna-core/package.nix
deleted file mode 100644
index 92f021ae594a..000000000000
--- a/pkgs/by-name/dl/dleyna-core/package.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  meson,
-  ninja,
-  pkg-config,
-  gupnp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dleyna-core";
-  version = "0.7.0";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  setupHook = ./setup-hook.sh;
-
-  src = fetchFromGitHub {
-    owner = "phako";
-    repo = "dleyna-core";
-    rev = "v${version}";
-    sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-  ];
-
-  propagatedBuildInputs = [
-    gupnp
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.cc.isClang [
-      "-Wno-error=implicit-function-declaration"
-      "-Wno-error=int-conversion"
-    ]
-  );
-
-  meta = with lib; {
-    description = "Library of utility functions that are used by the higher level dLeyna";
-    homepage = "https://github.com/phako/dleyna-core";
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
-    license = licenses.lgpl21Only;
-  };
-}
diff --git a/pkgs/by-name/dl/dleyna-core/setup-hook.sh b/pkgs/by-name/dl/dleyna-core/setup-hook.sh
deleted file mode 100644
index 287ad4dc1897..000000000000
--- a/pkgs/by-name/dl/dleyna-core/setup-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addDleynaConnectorPath () {
-    if test -d "$1/lib/dleyna-1.0/connectors"
-    then
-        export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors"
-    fi
-}
-
-addEnvHooks "$targetOffset" addDleynaConnectorPath
diff --git a/pkgs/by-name/dl/dleyna/package.nix b/pkgs/by-name/dl/dleyna/package.nix
new file mode 100644
index 000000000000..d40c9b89bbcd
--- /dev/null
+++ b/pkgs/by-name/dl/dleyna/package.nix
@@ -0,0 +1,57 @@
+{
+  stdenv,
+  lib,
+  docutils,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  pkg-config,
+  gupnp_1_6,
+  gupnp-av,
+  gupnp-dlna,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dleyna";
+  version = "0.8.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "World";
+    repo = "dLeyna";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ti4yF8sALpWyrdQTt/jVrMKQ4PLhakEi620fJNMxT0c=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    docutils
+    pkg-config
+  ];
+
+  buildInputs = [
+    gupnp_1_6
+    gupnp-dlna
+    gupnp-av
+    gupnp-dlna
+  ];
+
+  mesonFlags = [
+    # Sphinx docs not installed, do not depend on sphinx
+    "-Ddocs=false"
+  ];
+
+  meta = {
+    description = "Library of utility functions that are used by the higher level dLeyna";
+    homepage = "https://gitlab.gnome.org/World/dLeyna";
+    maintainers = with lib.maintainers; [ jtojnar ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Only;
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fa635a073dd7..d7ce048a9e9c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -500,6 +500,7 @@ mapAliases {
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
   dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
   diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
+  dleyna-core = dleyna; # Added 2025-04-19
   dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
   dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
   docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02