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

qt6.qttools: fix embedded path to tools

Browse Source
This commit is contained in:
Nick Cao 2023-04-13 21:12:17 +08:00
parent 37e3fafb41
commit e5ba8e7113
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-6/modules/qttools.nix
View File

@ -15,7 +15,7 @@ qtModule {
../patches/qttools-paths.patch
];
env.NIX_CFLAGS_COMPILE = toString [
"-DNIX_OUTPUT_DEV=\"${placeholder "dev"}\""
"-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
];
devTools = [

4
pkgs/development/libraries/qt-6/patches/qttools-paths.patch
View File

@ -10,9 +10,9 @@ index d355b9dc..94fef33f 100644
+{
+ switch (location) {
+ case QLibraryInfo::BinariesPath:
+ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/bin");
+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin");
+ case QLibraryInfo::LibraryExecutablesPath:
+ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/libexec");
+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec");
+ default:
+ return QLibraryInfo::path(location);
+ }