From dadf97952d574e6e44d10a2eb0e2afef86a96818 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 09:26:38 +0300 Subject: gnu: lyx: Don't install to custom directory. * gnu/packages/tex.scm (lyx)[arguments]: Adjust configure-flags to not add the version to the binary's suffix. Remove custom 'patch-desktop-file, 'setenv-check and 'install-symlink phases. --- gnu/packages/tex.scm | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index cd8270634c..f7d5fd1506 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6136,10 +6136,9 @@ and Karl Berry.") "-DLYX_EXTERNAL_BOOST=1" "-DLYX_INSTALL=1" "-DLYX_RELEASE=1" + "-DLYX_PROGRAM_SUFFIX=OFF" ,(string-append "-DLYX_INSTALL_PREFIX=" - (assoc-ref %outputs "out") - ;; Exact name and level is necessary. - "/lyx" ,(version-major+minor version))) + (assoc-ref %outputs "out"))) #:modules ((guix build cmake-build-system) (guix build qt-utils) (guix build utils)) @@ -6159,44 +6158,16 @@ and Karl Berry.") (assoc-ref inputs "python") "/bin/python3 "))) #t)) - (add-after 'patch-python 'patch-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "lib/lyx.desktop.in" - (("Exec=") - (string-append "Exec=" - (assoc-ref outputs "out") - "/"))) - #t)) (add-after 'unpack 'add-missing-test-file (lambda _ ;; Create missing file that would cause tests to fail. (with-output-to-file "src/tests/check_layout.cmake" (const #t)) #t)) - (add-before 'check 'setenv-check - (lambda _ - (setenv (string-append "LYX_DIR_" - (string-join - (string-split - ,(version-major+minor version) #\-)) "x") - (string-append (getcwd) "/../lyx-" ,version "/lib")) - #t)) (add-after 'install 'wrap-qt (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") - (string-append "../lyx" - ,(version-major+minor version) - "/bin/lyx" - ,(version-major+minor version))) - #t)) - (add-after 'install 'install-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (symlink (string-append "../lyx" ,(version-major+minor version) - "/bin/lyx" ,(version-major+minor version)) - (string-append out "/bin/lyx" ,(version-major+minor version))) - #t)))))) + (wrap-qt-program (assoc-ref outputs "out") "lyx") + #t))))) (inputs `(("boost" ,boost) ("hunspell" ,hunspell) ; Note: Could also use aspell instead. -- cgit 1.4.1