infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: lycheeslicer: Use chromium-binary-build-system.

Browse Source 
* 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>
This commit is contained in:
Giacomo Leidi 2023-05-19 18:44:00 +02:00 committed by Jonathan Brielmaier
parent 9096709e78
commit beab5813f0
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 9 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
nongnu/packages/engineering.scm
View File

@ -1,28 +1,17 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Copyright © 2022 Demis Balbach <db@minikn.xyz> ;;; Copyright © 2022 Demis Balbach <db@minikn.xyz>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
(define-module (nongnu packages engineering) (define-module (nongnu packages engineering)
#:use-module (gnu packages base) #: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 xorg)
#:use-module (gnu packages xml)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) :prefix license:) #: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 ((nonguix licenses) :prefix license:)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -39,42 +28,11 @@
(sha256 (sha256
(base32 "1rv3f8d1sb5irn4y8hjzk2m7c9irw71ls8p1mqambxg79q9ffj9m")))) (base32 "1rv3f8d1sb5irn4y8hjzk2m7c9irw71ls8p1mqambxg79q9ffj9m"))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(build-system binary-build-system) (build-system chromium-binary-build-system)
(arguments (arguments
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
#:patchelf-plan #:wrapper-plan
#~'(("lib/LycheeSlicer/lycheeslicer" #~'("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")))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'unpack (replace 'unpack
@ -96,68 +54,23 @@
(substitute* '("share/applications/lycheeslicer.desktop") (substitute* '("share/applications/lycheeslicer.desktop")
(("/opt/LycheeSlicer") (("/opt/LycheeSlicer")
(string-append #$output "/lib/LycheeSlicer"))))) (string-append #$output "/lib/LycheeSlicer")))))
(add-after 'install 'symlink-binary-file-and-cleanup (add-before 'install-wrapper 'symlink-binary-file-and-cleanup
(lambda _ (lambda _
(delete-file (string-append #$output "/environment-variables")) (delete-file (string-append #$output "/environment-variables"))
(mkdir-p (string-append #$output "/bin")) (mkdir-p (string-append #$output "/bin"))
(symlink (string-append #$output "/lib/LycheeSlicer/lycheeslicer") (symlink (string-append #$output "/lib/LycheeSlicer/lycheeslicer")
(string-append #$output "/bin/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 _ (lambda _
(wrap-program (string-append #$output "/lib/LycheeSlicer/lycheeslicer") (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 `("LD_LIBRARY_PATH" ":" prefix
(,(string-join (,(string-join
(list (list
(string-append #$(this-package-input "nss") "/lib/nss") (string-append #$output "/lib/LycheeSlicer"))
(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)
":"))))))))) ":")))))))))
(native-inputs (list tar)) (native-inputs (list tar))
(inputs (inputs
(list alsa-lib (list libxscrnsaver))
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))
(home-page "https://mango3d.io") (home-page "https://mango3d.io")
(synopsis "Slicer for resin 3d printers of different manufacturers") (synopsis "Slicer for resin 3d printers of different manufacturers")
(description "A user-friendly slicing software for resin 3d printers. It (description "A user-friendly slicing software for resin 3d printers. It