me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lyx: Use qt-build-system.

Browse source 
* gnu/packages/tex.scm (lyx)[build-system]: Switch to qt-build-system.
[arguments]: Remove imported modules. Remove custom 'wrap-qt phase.
This commit is contained in:
Efraim Flashner 2020-06-11 09:49:45 +03:00
parent dadf97952d
commit e192b9e02d
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/tex.scm
View file

@ -33,9 +33,9 @@
#: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 build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system texlive) #:use-module (guix build-system texlive)
#:use-module (guix utils) #:use-module (guix utils)
@ -6130,7 +6130,7 @@ and Karl Berry.")
'(begin '(begin
(delete-file-recursively "3rdparty") (delete-file-recursively "3rdparty")
#t)))) #t))))
(build-system cmake-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags `("-DLYX_USE_QT=QT5" `(#:configure-flags `("-DLYX_USE_QT=QT5"
"-DLYX_EXTERNAL_BOOST=1" "-DLYX_EXTERNAL_BOOST=1"
@ -6139,11 +6139,6 @@ and Karl Berry.")
"-DLYX_PROGRAM_SUFFIX=OFF" "-DLYX_PROGRAM_SUFFIX=OFF"
,(string-append "-DLYX_INSTALL_PREFIX=" ,(string-append "-DLYX_INSTALL_PREFIX="
(assoc-ref %outputs "out"))) (assoc-ref %outputs "out")))
#:modules ((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build qt-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-python (add-after 'unpack 'patch-python
@ -6163,10 +6158,6 @@ and Karl Berry.")
;; Create missing file that would cause tests to fail. ;; Create missing file that would cause tests to fail.
(with-output-to-file "src/tests/check_layout.cmake" (with-output-to-file "src/tests/check_layout.cmake"
(const #t)) (const #t))
#t))
(add-after 'install 'wrap-qt
(lambda* (#:key outputs #:allow-other-keys)
(wrap-qt-program (assoc-ref outputs "out") "lyx")
#t))))) #t)))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)