From e8cb992ccc2dcd242f7ac4c4afdc5898d81263e5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 14 Jan 2025 19:39:38 +0400
Subject: [PATCH 1/2] lsd2dsl: fix build

---
 pkgs/by-name/ls/lsd2dsl/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index c2b9719e3ab8..0b66f0365e14 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   makeDesktopItem,
   copyDesktopItems,
   cmake,
@@ -26,6 +27,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/nongeneric/lsd2dsl/commit/bbda5be1b76a4a44804483d00c07d79783eceb6b.patch";
+      hash = "sha256-7is83D1cMBArXVLe5TP7D7lUcwnTMeXjkJ+cbaH5JQk=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace "-Werror" ""
   '';
@@ -48,7 +56,7 @@ stdenv.mkDerivation rec {
     qt6.qtwebengine
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion";
+  env.NIX_CFLAGS_COMPILE = "-Wno-int-conversion";
 
   desktopItems = lib.singleton (makeDesktopItem {
     name = "lsd2dsl";

From 0bd5ea3e1b8550b7b072cae5a817cc057b02c4fa Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 1 Aug 2025 15:31:51 +0400
Subject: [PATCH 2/2] lsd2dsl: modernize

---
 pkgs/by-name/ls/lsd2dsl/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index 0b66f0365e14..6a7179a7f1c3 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -16,14 +16,14 @@
   qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lsd2dsl";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "nongeneric";
     repo = "lsd2dsl";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM=";
   };
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     exec = "lsd2dsl-qtgui";
     desktopName = "lsd2dsl";
     genericName = "lsd2dsl";
-    comment = meta.description;
+    comment = finalAttrs.meta.description;
     categories = [
       "Dictionary"
       "FileTools"
@@ -75,14 +75,14 @@ stdenv.mkDerivation rec {
     install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://rcebits.com/lsd2dsl/";
     description = "Lingvo dictionaries decompiler";
     longDescription = ''
       A decompiler for ABBYY Lingvo’s proprietary dictionaries.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
-}
+})