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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
42
pkgs/development/libraries/swiften/build-fix.patch
Normal file
42
pkgs/development/libraries/swiften/build-fix.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h
|
||||
--- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2018-04-06 13:06:46.000000000 +0300
|
||||
+++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2019-10-08 20:52:23.171475337 +0300
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <set>
|
||||
|
||||
#include <QWizard>
|
||||
+#include <QAbstractItemModel>
|
||||
|
||||
#include <Swiften/Base/Override.h>
|
||||
|
||||
diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp
|
||||
--- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp 2018-04-06 13:06:46.000000000 +0300
|
||||
+++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp 2019-10-08 21:12:25.284754131 +0300
|
||||
@@ -157,7 +157,7 @@
|
||||
miniUPnPInterface = new MiniUPnPInterface();
|
||||
miniUPnPSupported = miniUPnPInterface->isAvailable();
|
||||
}
|
||||
- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
|
||||
+// SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
|
||||
if (miniUPnPSupported) {
|
||||
return miniUPnPInterface;
|
||||
}
|
||||
@@ -168,7 +168,7 @@
|
||||
natPMPInterface = new NATPMPInterface();
|
||||
natPMPSupported = natPMPInterface->isAvailable();
|
||||
}
|
||||
- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
|
||||
+// SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
|
||||
if (natPMPSupported) {
|
||||
return natPMPInterface;
|
||||
}
|
||||
--- a/Swift/Controllers/ShowProfileController.h
|
||||
+++ b/Swift/Controllers/ShowProfileController.h
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <map>
|
||||
#include <Swiften/Elements/ErrorPayload.h>
|
||||
#include <Swiften/Elements/VCard.h>
|
||||
#include <Swiften/JID/JID.h>
|
||||
85
pkgs/development/libraries/swiften/default.nix
Normal file
85
pkgs/development/libraries/swiften/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, libidn
|
||||
, lua
|
||||
, miniupnpc
|
||||
, expat
|
||||
, zlib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, boost
|
||||
, sconsPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swiften";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
|
||||
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./scons.patch
|
||||
./build-fix.patch
|
||||
|
||||
# Fix build with latest boost
|
||||
# https://swift.im/git/swift/commit/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b
|
||||
(fetchpatch {
|
||||
name = "3666cbbe30e4d4e25401a5902ae359bc2c24248b.patch";
|
||||
url = "https://swift.im/git/swift/patch/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b";
|
||||
sha256 = "Wh8Nnfm0/EppSJ7aH2vTNObHtodE5tM19kV1oDfm70w=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
sconsPackages.scons_3_1_2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libidn
|
||||
lua
|
||||
miniupnpc
|
||||
expat
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
openssl
|
||||
boost
|
||||
];
|
||||
|
||||
sconsFlags = [
|
||||
"openssl=${openssl.dev}"
|
||||
"boost_includedir=${boost.dev}/include"
|
||||
"boost_libdir=${boost.out}/lib"
|
||||
"boost_bundled_enable=false"
|
||||
"max_jobs=1"
|
||||
"optimize=1"
|
||||
"debug=0"
|
||||
"swiften_dll=1"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Ensure bundled dependencies cannot be used.
|
||||
rm -rf 3rdParty
|
||||
'';
|
||||
|
||||
installTargets = "${placeholder "out"}";
|
||||
|
||||
installFlags = [
|
||||
"SWIFTEN_INSTALLDIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An XMPP library for C++, used by the Swift client";
|
||||
homepage = "http://swift.im/swiften.html";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.twey ];
|
||||
};
|
||||
}
|
||||
9
pkgs/development/libraries/swiften/scons.patch
Normal file
9
pkgs/development/libraries/swiften/scons.patch
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
--- a/BuildTools/SCons/SConscript.boot
|
||||
+++ b/BuildTools/SCons/SConscript.boot
|
||||
@@ -129,5 +129 @@ vars.Add(PathVariable("sparkle_public_dsa_key", "Optional path to a public DSA k
|
||||
-env_ENV = {
|
||||
- 'PATH' : os.environ['PATH'],
|
||||
- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
|
||||
- 'TERM' : os.environ.get("TERM", ""),
|
||||
-}
|
||||
+env_ENV = os.environ
|
||||
Loading…
Add table
Add a link
Reference in a new issue