ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-22 18:49:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mg: Set PKG_CONFIG instead of substituting.

Browse source 
* gnu/packages/text-editors.scm (mg)[arguments]: Add PKG_CONFIG
to #:make-flags, and remove the custom
'pkg-config-for-cross-compiling-target phase.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-18 14:16:45 +02:00
parent 7f2b9306ee
commit 5d2e3b6b23
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/text-editors.scm
View file

@ -532,7 +532,8 @@ (define-public mg
;; No test suite available. ;; No test suite available.
`(#:tests? #f `(#:tests? #f
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)
(string-append "CC=" ,(cc-for-target))) (string-append "CC=" ,(cc-for-target))
(string-append "PKG_CONFIG=" ,(pkg-config-for-target)))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-before 'build 'correct-location-of-diff (add-before 'build 'correct-location-of-diff
@ -541,13 +542,6 @@ (define-public mg
(("/usr/bin/diff") (("/usr/bin/diff")
(string-append (assoc-ref inputs "diffutils") (string-append (assoc-ref inputs "diffutils")
"/bin/diff"))))) "/bin/diff")))))
(add-before 'build 'pkg-config-for-cross-compiling-target
(lambda _
(substitute* "GNUmakefile"
(("pkg-config")
(or (which "pkg-config")
(string-append ,(%current-target-system)
"-pkg-config"))))))
(add-before 'install 'patch-tutorial-location (add-before 'install 'patch-tutorial-location
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "mg.1" (substitute* "mg.1"