summaryrefslogtreecommitdiff
path: root/nongnu/packages/engineering.scm
diff options
context:
space:
mode:
authorGiacomo Leidi <goodoldpaul@autistici.org>2023-05-19 18:44:00 +0200
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2023-07-12 23:23:38 +0200
commitbeab5813f060ec3aca1844f368f2debc9cf52f60 (patch)
treeca4aa6b402b6ff384d4bf66878d27ccbb4640e9f /nongnu/packages/engineering.scm
parent9096709e784f8f8cdb97497132f9f4e785215c80 (diff)
nongnu: lycheeslicer: Use chromium-binary-build-system.
* nongnu/packages/engineering.scm (lycheeslicer) [build-system]: Use chromium-binary-build-system; [patchelf-plan]: Drop it since the build system figures it out from the wrapper plan; [wrapper-plan]: New argument; [phases]: Adjust to chromium-build-system; [inputs]: Drop the inputs provided by the build system. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Diffstat (limited to 'nongnu/packages/engineering.scm')
-rw-r--r--nongnu/packages/engineering.scm105
1 files changed, 9 insertions, 96 deletions
diff --git a/nongnu/packages/engineering.scm b/nongnu/packages/engineering.scm
index 18c7864..e4ddd5b 100644
--- a/nongnu/packages/engineering.scm
+++ b/nongnu/packages/engineering.scm
@@ -1,28 +1,17 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Copyright © 2022 Demis Balbach <db@minikn.xyz>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
(define-module (nongnu packages engineering)
#:use-module (gnu packages base)
- #:use-module (gnu packages cups)
- #:use-module (gnu packages compression)
- #:use-module (gnu packages fontutils)
- #:use-module (gnu packages gcc)
- #:use-module (gnu packages gl)
- #:use-module (gnu packages glib)
- #:use-module (gnu packages gnome)
- #:use-module (gnu packages gtk)
- #:use-module (gnu packages linux)
- #:use-module (gnu packages nss)
- #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages xml)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module ((guix licenses) :prefix license:)
- #:use-module (nonguix build-system binary)
+ #:use-module (nonguix build-system chromium-binary)
#:use-module ((nonguix licenses) :prefix license:)
#:use-module (ice-9 match))
@@ -39,42 +28,11 @@
(sha256
(base32 "1rv3f8d1sb5irn4y8hjzk2m7c9irw71ls8p1mqambxg79q9ffj9m"))))
(supported-systems '("x86_64-linux"))
- (build-system binary-build-system)
+ (build-system chromium-binary-build-system)
(arguments
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
- #:patchelf-plan
- #~'(("lib/LycheeSlicer/lycheeslicer"
- ("alsa-lib"
- "at-spi2-atk"
- "at-spi2-core"
- "atk"
- "cairo"
- "cups"
- "dbus"
- "expat"
- "eudev"
- "fontconfig-minimal"
- "gcc"
- "gdk-pixbuf"
- "glib"
- "gtk+"
- "libdrm"
- "libnotify"
- "libsecret"
- "libx11"
- "libxcb"
- "libxcomposite"
- "libxdamage"
- "libxext"
- "libxfixes"
- "libxkbcommon"
- "libxrandr"
- "libxscrnsaver"
- "libxshmfence"
- "libxtst"
- "mesa"
- "nspr"
- "pango")))
+ #:wrapper-plan
+ #~'("lib/LycheeSlicer/lycheeslicer")
#:phases
#~(modify-phases %standard-phases
(replace 'unpack
@@ -96,68 +54,23 @@
(substitute* '("share/applications/lycheeslicer.desktop")
(("/opt/LycheeSlicer")
(string-append #$output "/lib/LycheeSlicer")))))
- (add-after 'install 'symlink-binary-file-and-cleanup
+ (add-before 'install-wrapper 'symlink-binary-file-and-cleanup
(lambda _
(delete-file (string-append #$output "/environment-variables"))
(mkdir-p (string-append #$output "/bin"))
(symlink (string-append #$output "/lib/LycheeSlicer/lycheeslicer")
(string-append #$output "/bin/lycheeslicer"))))
- (add-after 'install 'wrap-where-patchelf-does-not-work
+ (add-after 'install-wrapper 'wrap-where-patchelf-does-not-work
(lambda _
(wrap-program (string-append #$output "/lib/LycheeSlicer/lycheeslicer")
- `("FONTCONFIG_PATH" ":" prefix
- (,(string-join
- (list
- (string-append #$(this-package-input "fontconfig-minimal") "/etc/fonts")
- #$output)
- ":")))
`("LD_LIBRARY_PATH" ":" prefix
(,(string-join
(list
- (string-append #$(this-package-input "nss") "/lib/nss")
- (string-append #$(this-package-input "mesa") "/lib")
- (string-append #$(this-package-input "dbus") "/lib")
- (string-append #$(this-package-input "gcc") "/lib")
- (string-append #$(this-package-input "eudev") "/lib")
- (string-append #$(this-package-input "libsecret") "/lib")
- (string-append #$(this-package-input "libxscrnsaver") "/lib")
- (string-append #$(this-package-input "libnotify") "/lib")
- (string-append #$output "/lib/LycheeSlicer")
- #$output)
+ (string-append #$output "/lib/LycheeSlicer"))
":")))))))))
(native-inputs (list tar))
(inputs
- (list alsa-lib
- at-spi2-atk
- at-spi2-core
- atk
- cairo
- cups
- dbus
- expat
- eudev
- fontconfig
- `(,gcc "lib")
- glib
- gtk+
- libdrm
- libnotify
- libsecret
- libx11
- libxcb
- libxcomposite
- libxdamage
- libxext
- libxfixes
- libxkbcommon
- libxrandr
- libxscrnsaver
- libxshmfence
- libxtst
- mesa
- nspr
- nss
- pango))
+ (list libxscrnsaver))
(home-page "https://mango3d.io")
(synopsis "Slicer for resin 3d printers of different manufacturers")
(description "A user-friendly slicing software for resin 3d printers. It