gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.pyside6-qtads: 4.5.0 -> 5.0.0

Browse Source
This commit is contained in:
Audrey Dutcher
2026-07-01 17:13:40 -07:00
parent c5423a5587
commit 5178946d54
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/pyside6-qtads/default.nix
+5 -5
View File
@@ -8,19 +8,19 @@
qt6,
setuptools,
setuptools-scm,
shiboken6,
shiboken6-generator,
}:
buildPythonPackage rec {
pname = "pyside6-qtads";
version = "4.5.0";
version = "5.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mborgerson";
repo = "pyside6_qtads";
tag = "v${version}";
hash = "sha256-rAkv6dFyS4Nw3FDLwZ1zp0EU4BhD/xrhNgUiIIktJ8s=";
hash = "sha256-pSgDdfOuEnluiKKnCJjxVZbQwZld4tr7G2S8ZZXJkvo=";
fetchSubmodules = true;
};
@@ -29,7 +29,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace-fail @shiboken6@ ${shiboken6} \
--replace-fail @shiboken6@ ${shiboken6-generator} \
--replace-fail @pyside6@ ${pyside6}
# can't use pythonRelaxDepsHook because it runs postBuild but the dependency check
@@ -56,7 +56,7 @@ buildPythonPackage rec {
dependencies = [
pyside6
shiboken6
shiboken6-generator
];
nativeBuildInputs = [ pythonRelaxDepsHook ];
pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch
+12 -10
View File
@@ -1,38 +1,40 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c0568a..f12d50e 100644
index 84a6527..9483c70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,15 +105,17 @@ macro(pyside_config option output_var)
@@ -106,17 +106,17 @@ macro(pyside_config option output_var)
endmacro()
# Query for the shiboken generator path, Python path, include paths and linker flags.
# Query for the shiboken6-generator path, PySide6 path, Python path, include paths and linker flags.
+find_package(Shiboken6 REQUIRED)
+find_package(PySide6 REQUIRED)
pyside_config(--shiboken-module-path shiboken_module_path)
-pyside_config(--shiboken-generator-path shiboken_generator_path)
-pyside_config(--pyside-path pyside_path)
-pyside_config(--pyside-include-path pyside_include_dir 1)
-
+set(shiboken_generator_path "" CACHE PATH "Path where shiboken6 executable can be found")
+set(pyside_path "" CACHE PATH "pyside share path, where typesystems dir can be found")
+get_target_property(pyside_include_dir PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES)
pyside_config(--python-include-path python_include_dir)
-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1)
-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0)
-pyside_config(--shiboken-include-path shiboken_include_dir 1)
-pyside_config(--pyside-include-path pyside_include_dir 1)
-
+get_target_property(shiboken_include_dir Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(shiboken_shared_libraries Shiboken6::libshiboken IMPORTED_LOCATION_RELEASE)
pyside_config(--python-link-flags-cmake python_linking_data 0)
-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_module_shared_libraries 0)
-pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0)
+get_target_property(pyside_shared_libraries PySide6::pyside6 IMPORTED_LOCATION_RELEASE)
set(shiboken_path "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
if(NOT EXISTS ${shiboken_path})
# Print the computed variables
message(STATUS "Shiboken module path: ${shiboken_module_path}")
diff --git a/setup.py b/setup.py
index 802821b..f522818 100644
index 84cda9c..05139d1 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,9 @@ setuptools.setup(
"-DBUILD_STATIC:BOOL=ON",
"-DADS_VERSION=4.3.0",
"-DADS_VERSION=5.0.0",
f"-DPython3_ROOT_DIR={Path(sys.prefix)}",
- f"-DPython_EXECUTABLE={Path(sys.executable)}"
+ f"-DPython_EXECUTABLE={Path(sys.executable)}",