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
33
pkgs/tools/networking/quicktun/default.nix
Normal file
33
pkgs/tools/networking/quicktun/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libsodium }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "quicktun";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UCIS";
|
||||
repo = "QuickTun";
|
||||
rev = "2d0c6a9cda8c21f921a5d1197aeee92e9568ca39";
|
||||
sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx";
|
||||
};
|
||||
|
||||
patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this
|
||||
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
buildPhase = "bash build.sh";
|
||||
|
||||
installPhase = ''
|
||||
rm out/quicktun*tgz
|
||||
install -vD out/quicktun* -t $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Very simple, yet secure VPN software";
|
||||
homepage = "http://wiki.ucis.nl/QuickTun";
|
||||
maintainers = [ maintainers.fpletz ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
||||
19
pkgs/tools/networking/quicktun/tar-1.30.diff
Normal file
19
pkgs/tools/networking/quicktun/tar-1.30.diff
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
Fix build with gnutar-1.30
|
||||
|
||||
Creating source archive...
|
||||
tar: The following options were used after any non-optional arguments in archive create or update mode. These options are positional and affect only arguments that follow them. Please, rearrange them properly.
|
||||
tar: --exclude 'debian/data' has no effect
|
||||
tar: Exiting with failure status due to previous errors
|
||||
diff --git a/build.sh b/build.sh
|
||||
index 0ea0403..725178c 100755
|
||||
--- a/build.sh
|
||||
+++ b/build.sh
|
||||
@@ -25,7 +25,7 @@ rm -rf out/ obj/ tmp/
|
||||
mkdir -p out
|
||||
if [ "$1" != "debian" ]; then
|
||||
echo Creating source archive...
|
||||
- $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data"
|
||||
+ $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" --exclude "debian/data" build.sh clean.sh debian src version
|
||||
fi
|
||||
|
||||
mkdir -p obj tmp tmp/include tmp/lib
|
||||
Loading…
Add table
Add a link
Reference in a new issue