uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,67 @@
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }:
stdenv.mkDerivation {
pname = "nifskope";
version = "2.0.dev7";
src = fetchFromGitHub {
owner = "niftools";
repo = "nifskope";
rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi";
fetchSubmodules = true;
};
patches = [
./external-lib-paths.patch
(substituteAll {
src = ./qttools-bins.patch;
qttools = "${qttools.dev}/bin";
})
(fetchpatch {
name = "qt512-build-fix.patch";
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
})
] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
buildInputs = [ qtbase qttools libGLU.dev ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
preConfigure = ''
shopt -s globstar
for i in **/*.cpp; do
substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope
done
'';
# Inspired by install/linux-install/nifskope.spec.in.
installPhase = ''
runHook preInstall
d=$out/share/nifskope
mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,lang}
cp release/NifSkope $out/bin/
cp ./res/nifskope.png $out/share/pixmaps/
cp release/{nif.xml,kfm.xml,style.qss} $d/
cp res/shaders/*.frag res/shaders/*.prog res/shaders/*.vert $d/shaders/
cp ./res/lang/*.ts ./res/lang/*.tm $d/lang/
cp ./install/linux-install/nifskope.desktop $out/share/applications
substituteInPlace $out/share/applications/nifskope.desktop \
--replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \
--replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png"
find $out/share -type f -exec chmod -x {} \;
runHook postInstall
'';
meta = with lib; {
homepage = "http://niftools.sourceforge.net/wiki/NifSkope";
description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files";
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,33 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index 1c0bc5a..cc29fc5 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -330,14 +330,14 @@ nvtristrip {
}
qhull {
- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/qhull/src
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/qhull/src
+ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/qhull/src
+ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/qhull/src
else:INCLUDEPATH += lib/qhull/src
HEADERS += $$files($$PWD/lib/qhull/src/libqhull/*.h, false)
}
gli {
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/gli/gli -isystem ../nifskope/lib/gli/external
+ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/gli/gli -isystem ./lib/gli/external
else:INCLUDEPATH += lib/gli/gli lib/gli/external
HEADERS += $$files($$PWD/lib/gli/gli/*.hpp, true)
HEADERS += $$files($$PWD/lib/gli/gli/*.inl, true)
@@ -346,8 +346,8 @@ gli {
}
zlib {
- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/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)

View file

@ -0,0 +1,19 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index cc29fc5..b17bb6e 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -428,13 +428,10 @@ win32 {
# Optimization flags
QMAKE_CXXFLAGS_DEBUG -= -O0 -g
QMAKE_CXXFLAGS_DEBUG *= -Og -g3
- QMAKE_CXXFLAGS_RELEASE *= -O3 -mfpmath=sse
+ QMAKE_CXXFLAGS_RELEASE *= -O3
# C++11 Support
QMAKE_CXXFLAGS_RELEASE *= -std=c++14
-
- # Extension flags
- QMAKE_CXXFLAGS_RELEASE *= -msse2 -msse
}
win32 {

View file

@ -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