nifskope: fix zlib build
This commit is contained in:
parent
48490a4264
commit
e27810b823
@ -7,6 +7,7 @@
|
|||||||
qttools,
|
qttools,
|
||||||
replaceVars,
|
replaceVars,
|
||||||
libGLU,
|
libGLU,
|
||||||
|
zlib,
|
||||||
wrapQtAppsHook,
|
wrapQtAppsHook,
|
||||||
fetchpatch,
|
fetchpatch,
|
||||||
}:
|
}:
|
||||||
@ -19,12 +20,13 @@ stdenv.mkDerivation {
|
|||||||
owner = "niftools";
|
owner = "niftools";
|
||||||
repo = "nifskope";
|
repo = "nifskope";
|
||||||
rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
|
rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
|
||||||
sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi";
|
hash = "sha256-8TNXDSZ3okeMtuGEHpKOnKyY/Z/w4auG5kjgmUexF/M=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./external-lib-paths.patch
|
./external-lib-paths.patch
|
||||||
|
./zlib.patch
|
||||||
(replaceVars ./qttools-bins.patch {
|
(replaceVars ./qttools-bins.patch {
|
||||||
qttools = "${qttools.dev}/bin";
|
qttools = "${qttools.dev}/bin";
|
||||||
})
|
})
|
||||||
@ -39,6 +41,7 @@ stdenv.mkDerivation {
|
|||||||
qtbase
|
qtbase
|
||||||
qttools
|
qttools
|
||||||
libGLU
|
libGLU
|
||||||
|
zlib
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
qmake
|
qmake
|
||||||
|
|||||||
39
pkgs/tools/graphics/nifskope/zlib.patch
Normal file
39
pkgs/tools/graphics/nifskope/zlib.patch
Normal 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
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user