nifskope: fix zlib build

This commit is contained in:
Petr Zahradnik 2025-01-26 18:00:18 +01:00
parent 48490a4264
commit e27810b823
2 changed files with 43 additions and 1 deletions

View File

@ -7,6 +7,7 @@
qttools,
replaceVars,
libGLU,
zlib,
wrapQtAppsHook,
fetchpatch,
}:
@ -19,12 +20,13 @@ stdenv.mkDerivation {
owner = "niftools";
repo = "nifskope";
rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi";
hash = "sha256-8TNXDSZ3okeMtuGEHpKOnKyY/Z/w4auG5kjgmUexF/M=";
fetchSubmodules = true;
};
patches = [
./external-lib-paths.patch
./zlib.patch
(replaceVars ./qttools-bins.patch {
qttools = "${qttools.dev}/bin";
})
@ -39,6 +41,7 @@ stdenv.mkDerivation {
qtbase
qttools
libGLU
zlib
];
nativeBuildInputs = [
qmake

View File

@ -0,0 +1,39 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index 89b8471f6410..8e136ddf44c6 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -17,7 +17,7 @@ contains(QT_VERSION, ^5\\.[0-6]\\..*) {
CONFIG += c++14
# Dependencies
-CONFIG += nvtristrip qhull zlib lz4 fsengine gli
+CONFIG += nvtristrip qhull lz4 fsengine gli
# Debug/Release options
CONFIG(debug, debug|release) {
@@ -345,14 +345,6 @@ gli {
HEADERS += $$files($$PWD/lib/gli/external/glm/*.inl, true)
}
-zlib {
- !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib
- !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib
- else:INCLUDEPATH += lib/zlib
- HEADERS += $$files($$PWD/lib/zlib/*.h, false)
- SOURCES += $$files($$PWD/lib/zlib/*.c, false)
-}
-
lz4 {
DEFINES += LZ4_STATIC XXH_PRIVATE_API
@@ -442,6 +434,10 @@ win32 {
LIBS += -lopengl32 -lglu32
}
+unix {
+ LIBS += -lz
+}
+
unix:!macx {
LIBS += -lGLU
}