diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-06-18 00:07:06 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-06-18 00:52:16 +0200 |
| commit | d60127fd8c43b0c8c4dc572dc53464ee28a24f56 (patch) | |
| tree | 25cf4f8b02880f9c6a197b5c7ca8fd7cee81d8a0 /pkgs/tools/graphics/nifskope/qttools-bins.patch | |
| parent | 07d23845c319a260f101ee825ed9402ff117e87e (diff) | |
| download | nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar.gz nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar.bz2 nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar.lz nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar.xz nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.tar.zst nixpkgs-d60127fd8c43b0c8c4dc572dc53464ee28a24f56.zip | |
nifskope: 1.1.3 -> 2.0.dev7
`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.
Diffstat (limited to 'pkgs/tools/graphics/nifskope/qttools-bins.patch')
| -rw-r--r-- | pkgs/tools/graphics/nifskope/qttools-bins.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/tools/graphics/nifskope/qttools-bins.patch new file mode 100644 index 00000000000..5d85f9ef4fd --- /dev/null +++ b/pkgs/tools/graphics/nifskope/qttools-bins.patch @@ -0,0 +1,22 @@ +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 |