mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +00:00
d60127fd8c
`nifskope` v2 contains a lot of new features and a new, QT5-based UI (see https://github.com/niftools/nifskope/releases). Additionally the 2.0 sourcetree exists for quite a while and after some short user tests it seems fairly stable. The following aspects have been changed: * Use QT 5.9 rather than QT4 (see #33248). * GCC7 support from upstream (gcc6 patch not needed anymore, build on GCC7 works fine), disabled `-Werror=format-security` can be used again as compiler flag. * Patched broken paths in `NifSkope_targets.pri` to point to the proper dependencies (otherwise `<gli.hpp>` and `qhull` couldn't be found). * Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the needed binaries, instead they need to point to `libsForQt5x.qttools`). * Added myself as maintainer.
23 lines
721 B
Diff
23 lines
721 B
Diff
diff --git a/NifSkope_targets.pri b/NifSkope_targets.pri
|
|
index 05324c2..d8389b1 100644
|
|
--- a/NifSkope_targets.pri
|
|
+++ b/NifSkope_targets.pri
|
|
@@ -11,7 +11,7 @@ else:EXE = ""
|
|
## lupdate / lrelease
|
|
###############################
|
|
|
|
-QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate$${EXE}
|
|
+QMAKE_LUPDATE = @qttools@/lupdate$${EXE}
|
|
exists($$QMAKE_LUPDATE) {
|
|
# Make target for Updating .ts
|
|
updatets.target = updatets
|
|
@@ -23,7 +23,7 @@ exists($$QMAKE_LUPDATE) {
|
|
message("lupdate could not be found, ignoring make target")
|
|
}
|
|
|
|
-QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease$${EXE}
|
|
+QMAKE_LRELEASE = @qttools@/lrelease$${EXE}
|
|
exists($$QMAKE_LRELEASE) {
|
|
# Build Step for Releasing .ts->.qm
|
|
updateqm.input = TRANSLATIONS
|