mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
parent
b0047e7782
commit
e7b51bb38f
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx";
|
||||
};
|
||||
|
||||
patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this
|
||||
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
buildPhase = "bash build.sh";
|
||||
|
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…
Reference in New Issue
Block a user