aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/misc/doomseeker/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkg-config, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
mkDerivation {
pname = "doomseeker";
version = "2018-03-05";
src = fetchFromBitbucket {
owner = "Doomseeker";
repo = "doomseeker";
rev = "c2c7f37b1afb";
sha256 = "17fna3a604miqsvply3klnmypps4ifz8axgd3pj96z46ybxs8akw";
};
patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
nativeBuildInputs = [ cmake qttools pkg-config xxd ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
hardeningDisable = lib.optional stdenv.isDarwin "format";
meta = with lib; {
homepage = "http://doomseeker.drdteam.org/";
description = "Multiplayer server browser for many Doom source ports";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.MP2E ];
};
}

40
pkgs/applications/misc/doomseeker/fix_paths.patch Normal file
View file

@ -0,0 +1,40 @@
diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp
--- source-old/src/core/datapaths.cpp 1970-01-01 03:00:01.000000000 +0300
+++ source-new/src/core/datapaths.cpp 2018-03-04 00:10:25.247262567 +0300
@@ -335,7 +335,7 @@
paths.append(workingDirectory());
paths.append("./");
#ifndef Q_OS_WIN32
- paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/");
+ paths.append(INSTALL_PREFIX "/lib/doomseeker/");
#endif
paths = uniquePaths(paths);
return Strings::combineManyPaths(paths, "engines/");
diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp
--- source-old/src/core/pathfinder/pathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
+++ source-new/src/core/pathfinder/pathfinder.cpp 2018-03-04 00:09:34.862556976 +0300
@@ -128,9 +128,7 @@
<< DataPaths::programFilesDirectory(DataPaths::x64)
<< DataPaths::programFilesDirectory(DataPaths::x86);
#else
- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin"
- << "/usr/games/" << "/usr/local/games/"
- << "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << ".";
+ paths << gDefaultDataPaths->workingDirectory() << ".";
#endif
QStringList pathsCopy(paths);
foreach (const QString &path, pathsCopy)
diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp
--- source-old/src/core/pathfinder/wadpathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
+++ source-new/src/core/pathfinder/wadpathfinder.cpp 2018-03-04 00:09:56.822865339 +0300
@@ -84,10 +84,6 @@
QStringList defaultPaths()
{
QStringList paths;
- #ifdef Q_OS_UNIX
- paths << "/usr/local/share/games/doom/"
- << "/usr/share/games/doom/";
- #endif
return paths;
}
};

47
pkgs/applications/misc/doomseeker/qt_build_fix.patch Normal file
View file

@ -0,0 +1,47 @@
diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp
--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -32,6 +32,7 @@
#include <QInputDialog>
#include <QMessageBox>
#include <QToolBar>
+#include <QTabBar>
DClass<IRCDock> : public Ui::IRCDock
{
diff -r c2c7f37b1afb src/core/gui/logdock.cpp
--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -21,6 +21,8 @@
// Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com>
//------------------------------------------------------------------------------
+#include <QAction>
+
#include "clipboard.h"
#include "logdock.h"
#include "log.h"
diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp
--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -21,6 +21,7 @@
// Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net>
//------------------------------------------------------------------------------
+#include <QAction>
#include <QBoxLayout>
#include "serverdetailsdock.h"
diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp
--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -20,6 +20,9 @@
//------------------------------------------------------------------------------
// Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com>
//------------------------------------------------------------------------------
+
+#include <QAction>
+
#include "serverfilterdock.h"
#include "ui_serverfilterdock.h"