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

NM-pptp: 0.9.2.0, optional GNOME support

Browse Source 
svn path=/nixpkgs/trunk/; revision=32986
This commit is contained in:
Yury G. Kudryashov 2012-03-11 14:07:37 +00:00
parent d7e089e820
commit 7c4a72dd77
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/tools/networking/network-manager/pptp.nix
View File

@ -1,24 +1,26 @@
{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig }: { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
, withGnome ? false, gtk, libgnome_keyring }:
let
pn = "networkmanager-pptp";
gnome_pn = "NetworkManager-pptp";
major = "0.9";
version = "0.9.0";
src = fetchurl {
url = "mirror://gnome/sources/${gnome_pn}/${major}/${gnome_pn}-${version}.tar.xz";
sha256 = "1mfbavcnc871sxkisisnic472am0qmkgw7caj0b86sdir2q83nlp";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pn}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-pptp";
version = "0.9.2.0";
inherit src; src = fetchurl {
url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
sha256 = "1fj2v8pjc17m9calckgc2jm8wbimwga8if4r21walf9xysvhsd1b";
};
buildInputs = [ networkmanager pptp ppp ]; buildInputs = [ networkmanager pptp ppp ]
++ stdenv.lib.optionals withGnome [ gtk libgnome_keyring ];
buildNativeInputs = [ intltool pkgconfig ]; buildNativeInputs = [ intltool pkgconfig ];
configureFlags = "--without-gnome --disable-nls"; configureFlags =
if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome";
meta = {
description = "PPtP plugin for NetworkManager";
inherit (networkmanager.meta) maitainers platforms;
};
} }

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

@ -1075,6 +1075,8 @@ let
networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};