2 files changed, 40 insertions(+), 39 deletions(-)

M gnu/packages/electronics.scm
M gnu/packages/engineering.scm

@@ 55,8 55,10 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fpga)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gd)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libftdi)


@@ 104,6 106,44 @@ individual low-level driver modules.")
     (home-page "https://www.comedi.org/")
     (license license:lgpl2.1)))
 
+(define-public librnd
+  (package
+    (name "librnd")
+    (version "4.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.repo.hu/projects/librnd/"
+                                  "releases/librnd-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1qjv6gg9fb3rpvr1y9l5nbzz2xk2sa4nqz0dgwvds5hc1bmd97mf"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     (list
+      #:tests? #false                   ;no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; The configure script doesn't tolerate most of our configure
+          ;; flags.
+          (replace 'configure
+            (lambda _
+              (setenv "CC" #$(cc-for-target))
+              (invoke "./configure" (string-append "--prefix=" #$output)))))))
+    (inputs
+     (list gd glib glu gtk gtkglext libepoxy))
+    (native-inputs
+     (list pkg-config))
+    (home-page "http://repo.hu/projects/librnd/")
+    (synopsis "Two-dimensional CAD engine")
+    (description "This is a flexible, modular two-dimensional CAD engine
+@itemize
+@item with transparent multiple GUI toolkit support;
+@item a flexible, dynamic menu system;
+@item a flexible, dynamic configuration system; and
+@item support for user scripting in a dozen languages.
+@end itemize")
+    (license license:gpl2+)))
+
 (define-public libserialport
   (package
     (name "libserialport")

@@ 67,7 67,6 @@
   #:use-module (guix build-system copy)
   #:use-module (guix build-system emacs)
   #:use-module (guix build-system guile)
-  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system pyproject)


@@ 567,44 566,6 @@ materials (BOM) generation, netlisting into over 20 netlist formats, analog
 and digital simulation, and printed circuit board (PCB) layout, and many other
 features.")))
 
-(define-public librnd
-  (package
-    (name "librnd")
-    (version "4.3.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://www.repo.hu/projects/librnd/"
-                                  "releases/librnd-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1qjv6gg9fb3rpvr1y9l5nbzz2xk2sa4nqz0dgwvds5hc1bmd97mf"))))
-    (build-system glib-or-gtk-build-system)
-    (arguments
-     (list
-      #:tests? #false                   ;no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; The configure script doesn't tolerate most of our configure
-          ;; flags.
-          (replace 'configure
-            (lambda _
-              (setenv "CC" #$(cc-for-target))
-              (invoke "./configure" (string-append "--prefix=" #$output)))))))
-    (inputs
-     (list gd glib glu gtk gtkglext libepoxy))
-    (native-inputs
-     (list pkg-config))
-    (home-page "http://repo.hu/projects/librnd/")
-    (synopsis "Two-dimensional CAD engine")
-    (description "This is a flexible, modular two-dimensional CAD engine
-@itemize
-@item with transparent multiple GUI toolkit support;
-@item a flexible, dynamic menu system;
-@item a flexible, dynamic configuration system; and
-@item support for user scripting in a dozen languages.
-@end itemize")
-    (license license:gpl2+)))
-
 (define-public pcb
   (package
     (name "pcb")