diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-26 18:02:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-26 18:02:58 +0100 |
| commit | e7b51bb38f87b461501feae48892c25ee5f672a0 (patch) | |
| tree | 2a9b8aadc6a0b365072d54ce28acf4d7210faddf /pkgs/tools/networking | |
| parent | b0047e77820c7dbfdba935bf77f0889142bd41a4 (diff) | |
| download | nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar.gz nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar.bz2 nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar.lz nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar.xz nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.tar.zst nixlib-e7b51bb38f87b461501feae48892c25ee5f672a0.zip | |
quicktun: fixup build with gnutar-1.30
/cc #32816.
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/quicktun/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/quicktun/tar-1.30.diff | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 6332d6c85774..ceee8cca1aae 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -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"; diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/tools/networking/quicktun/tar-1.30.diff new file mode 100644 index 000000000000..88498e542807 --- /dev/null +++ b/pkgs/tools/networking/quicktun/tar-1.30.diff @@ -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 |