ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xournalpp: Use G-expressions.

Browse source 
* gnu/packages/pdf.scm (xournalpp)[arguments]: Use G-expressions.
<#:phases>: Replace WHICH with SEARCH-INPUT-FILES.
This commit is contained in:
Nicolas Goaziou 2022-02-14 12:00:08 +01:00
parent d00b6dd689
commit 72dd5c8766
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/pdf.scm
View file

@ -42,6 +42,7 @@ (define-module (gnu packages pdf)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -896,23 +897,26 @@ (define-public xournalpp
(base32 "16pf50x1ps8dcynnvw5lz7ggl0jg7qvzv6gkd30xg3hkcxff8ch3")))) (base32 "16pf50x1ps8dcynnvw5lz7ggl0jg7qvzv6gkd30xg3hkcxff8ch3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests (list
#:imported-modules ((guix build glib-or-gtk-build-system) #:configure-flags #~(list "-DENABLE_CPPUNIT=ON") ;enable tests
#:imported-modules `((guix build glib-or-gtk-build-system)
,@%cmake-build-system-modules) ,@%cmake-build-system-modules)
#:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build cmake-build-system) (guix build cmake-build-system)
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; Fix path to addr2line utility, which the crash reporter uses. ;; Fix path to addr2line utility, which the crash reporter uses.
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/util/Stacktrace.cpp" (substitute* "src/util/Stacktrace.cpp"
;; Match only the commandline. ;; Match only the commandline.
(("\"addr2line ") (("\"addr2line ")
(string-append "\"" (which "addr2line") " "))))) (string-append "\""
(add-after 'install 'glib-or-gtk-wrap (search-input-file inputs "/bin/addr2line")
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) " ")))))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs (native-inputs
(list cppunit gettext-minimal help2man pkg-config)) (list cppunit gettext-minimal help2man pkg-config))
(inputs (inputs