diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/tools/networking/tinc/pre.nix | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/networking/tinc/pre.nix')
| -rw-r--r-- | pkgs/tools/networking/tinc/pre.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 5473a637b6a3..61e4ee281edc 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356"; - version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}"; + version = "1.1pre14"; src = fetchgit { - inherit rev; + rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf"; + sha256 = "0idc4ddhz380xw26c8wwdyr0p6pibada55f0hzhnc2cz9za9x4iv"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; @@ -18,6 +19,10 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace UNKNOWN ${version} ''; + postInstall = '' + rm $out/bin/tinc-gui + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" |