public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gvpe: reimpleemnt using mkDerivation

Browse Source
This commit is contained in:
Joachim Fasting 2015-06-15 14:10:46 +02:00
parent 34fda4cbe2
commit 6857170916
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/tools/networking/gvpe/default.nix
View File

@ -1,33 +1,30 @@
a @ { openssl, gmp, nettools, iproute, zlib, ... } : { stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
let
s = import ./src-for-default.nix; stdenv.mkDerivation rec {
buildInputs = with a; [ name = "gvpe-${version}";
openssl gmp zlib version = "2.25";
];
in src = fetchurl {
rec { url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
src = a.fetchUrlFromSrcInfo s; sha256 = "1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
};
buildInputs = [ openssl gmp zlib ];
inherit (s) name;
inherit buildInputs;
configureFlags = [ configureFlags = [
"--enable-tcp" "--enable-tcp"
"--enable-http-proxy" "--enable-http-proxy"
"--enable-dns" "--enable-dns"
]; ];
/* doConfigure should be removed if not needed */ preBuild = ''
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
preBuild = a.fullDepEntry ('' sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C '';
sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
'') ["minInit" "doUnpack"];
meta = { meta = {
description = "A proteted multinode virtual network"; description = "A protected multinode virtual network";
maintainers = [ maintainers = [ stdenv.lib.maintainers.raskin ];
a.lib.maintainers.raskin platforms = with stdenv.lib.platforms; linux ++ freebsd;
];
platforms = with a.lib.platforms; linux ++ freebsd;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -1780,7 +1780,7 @@ let
gupnptools = callPackage ../tools/networking/gupnp-tools {}; gupnptools = callPackage ../tools/networking/gupnp-tools {};
gvpe = builderDefsPackage (callPackage ../tools/networking/gvpe) {}; gvpe = callPackage ../tools/networking/gvpe { };
gvolicon = callPackage ../tools/audio/gvolicon {}; gvolicon = callPackage ../tools/audio/gvolicon {};