librecad: adopt, modernize, migrate to by-name

NixOS · Jan 12, 2025 · 7898b8b · 7898b8b
1 parent 908a2ad
commit 7898b8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/pkgs/applications/misc/librecad/default.nix → pkgs/by-name/li/librecad/package.nix b/pkgs/applications/misc/librecad/default.nix → pkgs/by-name/li/librecad/package.nix
@@ -1,41 +1,39 @@
 {
   lib,
+  stdenv,
   boost,
   fetchFromGitHub,
   installShellFiles,
-  mkDerivation,
   muparser,
   pkg-config,
-  qmake,
-  qtbase,
-  qtsvg,
-  qttools,
+  qt5,
   runtimeShell,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "librecad";
   version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "LibreCAD";
     repo = "LibreCAD";
-    rev = version;
-    sha256 = "sha256-GBn4lduzaKWEWzeTNjC9TpioSouVj+jVl32PLjc8FBc=";
+    tag = "v${version}";
+    hash = "sha256-GBn4lduzaKWEWzeTNjC9TpioSouVj+jVl32PLjc8FBc=";
   };
 
   buildInputs = [
     boost
     muparser
-    qtbase
-    qtsvg
+    qt5.qtbase
+    qt5.qtsvg
   ];
 
   nativeBuildInputs = [
     installShellFiles
     pkg-config
-    qmake
-    qttools
+    qt5.qmake
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
 
   qmakeFlags = [
@@ -68,11 +66,11 @@ mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "2D CAD package based on Qt";
     homepage = "https://librecad.org";
-    license = licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -14272,8 +14272,6 @@ with pkgs;
 
   libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
 
-  librecad = libsForQt5.callPackage ../applications/misc/librecad { };
-
   libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
 
   libreoffice = hiPrio libreoffice-still;