me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lyx: Remove reference to '%outputs'.

Browse source 
* gnu/packages/tex.scm (lyx)[arguments]: Rewrite as gexps.  Refer
to #$output instead of '%outputs', which 'qt-build-system' no longer
defines.
This commit is contained in:
Ludovic Courtès 2021-11-21 15:48:37 +01:00
parent 85de88f1ad
commit 3f66b4c266
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gnu/packages/tex.scm
View file

@ -38,6 +38,7 @@
(define-module (gnu packages tex) (define-module (gnu packages tex)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system copy) #:use-module (guix build-system copy)
@ -7299,33 +7300,31 @@ and Karl Berry.")
#t)))) #t))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags `("-DLYX_USE_QT=QT5" (list #:configure-flags
"-DLYX_EXTERNAL_BOOST=1" #~(list "-DLYX_USE_QT=QT5"
"-DLYX_INSTALL=1" "-DLYX_EXTERNAL_BOOST=1"
"-DLYX_RELEASE=1" "-DLYX_INSTALL=1"
"-DLYX_PROGRAM_SUFFIX=OFF" "-DLYX_RELEASE=1"
,(string-append "-DLYX_INSTALL_PREFIX=" "-DLYX_PROGRAM_SUFFIX=OFF"
(assoc-ref %outputs "out"))) (string-append "-DLYX_INSTALL_PREFIX=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-python (add-after 'unpack 'patch-python
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("lib/configure.py" (substitute* '("lib/configure.py"
"src/support/ForkedCalls.cpp" "src/support/ForkedCalls.cpp"
"src/support/Systemcall.cpp" "src/support/Systemcall.cpp"
"src/support/os.cpp" "src/support/os.cpp"
"src/support/filetools.cpp") "src/support/filetools.cpp")
(("\"python ") (("\"python ")
(string-append "\"" (string-append "\""
(assoc-ref inputs "python") (assoc-ref inputs "python")
"/bin/python3 "))) "/bin/python3 ")))))
#t)) (add-after 'unpack 'add-missing-test-file
(add-after 'unpack 'add-missing-test-file (lambda _
(lambda _ ;; 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)))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("hunspell" ,hunspell) ; Note: Could also use aspell instead. ("hunspell" ,hunspell) ; Note: Could also use aspell instead.