mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-25 20:19:18 -05:00
gnu: scintilla: Update to 4.2.1.
* gnu/packages/text-editors.scm (scintilla): Update to 4.2.1. [arguments]: Remove unnecessary phase. [native-inputs]: Remove "gcc" as default GCC is now higher than 7.1. Add "python-wrapper" for some scripts.
This commit is contained in:
parent
51d602a5c1
commit
dee632a8b4
1 changed files with 4 additions and 13 deletions
|
@ -444,7 +444,7 @@ (define-public texmacs
|
||||||
(define-public scintilla
|
(define-public scintilla
|
||||||
(package
|
(package
|
||||||
(name "scintilla")
|
(name "scintilla")
|
||||||
(version "4.2.0")
|
(version "4.2.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (let ((v (apply string-append (string-split version #\.))))
|
(uri (let ((v (apply string-append (string-split version #\.))))
|
||||||
|
@ -452,7 +452,7 @@ (define-public scintilla
|
||||||
"https://www.scintilla.org/scintilla" v ".tgz")))
|
"https://www.scintilla.org/scintilla" v ".tgz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"02ymi86fpcypg6423vfr54lbkxbks046q02v3m3dypawcf3bqy42"))))
|
"0l52s39zg8l3fcj86nqm3hzh0sa4i981dasil54a40dvz3d3cvrx"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk")
|
`(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk")
|
||||||
|
@ -468,15 +468,6 @@ (define-public scintilla
|
||||||
"$(CC) -shared $^ -o $@")
|
"$(CC) -shared $^ -o $@")
|
||||||
(("\\$\\(RANLIB\\) \\$@") ""))
|
(("\\$\\(RANLIB\\) \\$@") ""))
|
||||||
#t))
|
#t))
|
||||||
(add-before 'build 'expand-C++-include-path
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
;; Make <gcc>/include/c++/ext/string_conversions.h find
|
|
||||||
;; <stdlib.h>.
|
|
||||||
(let* ((path "CPLUS_INCLUDE_PATH")
|
|
||||||
(gcc (assoc-ref inputs "gcc"))
|
|
||||||
(c++ (string-append gcc "/include/c++")))
|
|
||||||
(setenv path (string-append c++ ":" (getenv path))))
|
|
||||||
#t))
|
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
@ -487,8 +478,8 @@ (define-public scintilla
|
||||||
(find-files "include/" "."))
|
(find-files "include/" "."))
|
||||||
#t))))))
|
#t))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc" ,gcc-7) ;require GCC 7.1+
|
`(("pkg-config" ,pkg-config)
|
||||||
("pkg-config" ,pkg-config)))
|
("python" ,python-wrapper)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("gtk+" ,gtk+)))
|
`(("gtk+" ,gtk+)))
|
||||||
(home-page "https://www.scintilla.org/")
|
(home-page "https://www.scintilla.org/")
|
||||||
|
|
Loading…
Reference in a new issue