mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-04 09:16:31 +01:00
gnu: python-shiboken-6: Update to 6.6.2.
* gnu/packages/qt.scm (python-shiboken-6, python-pyside-6): Update to 6.6.2. (python-shiboken-6)[properties]: Set upstream-name. (python-pyside-6)[arguments]<#:configure-flags>: Set CMAKE_INSTALL_RPATH. Change-Id: I098481f860c3bc97a629cca719305b2d00c3eace Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
parent
8dad48c804
commit
e2d1eaef29
1 changed files with 10 additions and 5 deletions
|
@ -4603,7 +4603,7 @@ (define-public python-shiboken-6
|
||||||
(package
|
(package
|
||||||
(inherit python-shiboken-2)
|
(inherit python-shiboken-2)
|
||||||
(name "python-shiboken-6")
|
(name "python-shiboken-6")
|
||||||
(version "6.5.2")
|
(version "6.6.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
|
(uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
|
||||||
|
@ -4611,7 +4611,7 @@ (define-public python-shiboken-6
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh"))))
|
"1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs (package-inputs python-shiboken-2)
|
(modify-inputs (package-inputs python-shiboken-2)
|
||||||
|
@ -4631,7 +4631,8 @@ (define-public python-shiboken-6
|
||||||
"-DCMAKE_SKIP_RPATH=TRUE"
|
"-DCMAKE_SKIP_RPATH=TRUE"
|
||||||
(string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
|
(string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
|
||||||
#$output "/lib")
|
#$output "/lib")
|
||||||
#$flags))))))
|
#$flags))))
|
||||||
|
(properties `((upstream-name . "pyside-setup")))))
|
||||||
|
|
||||||
(define-public python-pyside-2
|
(define-public python-pyside-2
|
||||||
(package
|
(package
|
||||||
|
@ -4767,12 +4768,16 @@ (define-public python-pyside-6
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(list "-DBUILD_TESTS=FALSE"
|
#~(list "-DBUILD_TESTS=FALSE"
|
||||||
(string-append "-DPYTHON_EXECUTABLE="
|
(string-append "-DPYTHON_EXECUTABLE="
|
||||||
(search-input-file %build-inputs
|
(search-input-file %build-inputs "/bin/python")))
|
||||||
"/bin/python")))
|
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'go-to-source-dir
|
(add-after 'unpack 'go-to-source-dir
|
||||||
(lambda _ (chdir "sources/pyside6")))
|
(lambda _ (chdir "sources/pyside6")))
|
||||||
|
(add-after 'go-to-source-dir 'set-rpath
|
||||||
|
(lambda _
|
||||||
|
(substitute* "CMakeLists.txt"
|
||||||
|
(("CMAKE_INSTALL_RPATH")
|
||||||
|
(string-append "CMAKE_INSTALL_RPATH " #$output "/lib")))))
|
||||||
(add-after 'go-to-source-dir 'fix-qt-module-detection
|
(add-after 'go-to-source-dir 'fix-qt-module-detection
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "cmake/PySideHelpers.cmake"
|
(substitute* "cmake/PySideHelpers.cmake"
|
||||||
|
|
Loading…
Reference in a new issue