From 180205a431d33bec8eec072a24b2f9278cf0f349 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 4 Jan 2011 00:28:22 +0000 Subject: [PATCH] knetwork-manager: package and enable support in KDE to see what is going to break. svn path=/nixpkgs/trunk/; revision=25375 --- .../kde-4.5/base-workspace/default.nix | 4 +-- .../tools/networking/knetworkmanager/live.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/knetworkmanager/live.nix diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index 9c4c5ead360..f0c69f788f5 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -3,7 +3,7 @@ , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, strigi, soprano, qimageblitz, akonadi -, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez +, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager }: kde.package { @@ -13,7 +13,7 @@ kde.package { kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate - pciutils bluez ]; + pciutils bluez networkmanager ]; meta = { description = "KDE base platform-specific components"; diff --git a/pkgs/tools/networking/knetworkmanager/live.nix b/pkgs/tools/networking/knetworkmanager/live.nix new file mode 100644 index 00000000000..80c7e9335b6 --- /dev/null +++ b/pkgs/tools/networking/knetworkmanager/live.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, fetchgitrevision, cmake, kdelibs, automoc4, networkmanager, kdebase_workspace +, repository ? "git://anongit.kde.org/networkmanagement" +, branch ? "heads/master" +, rev ? fetchgitrevision repository branch +, src ? fetchgit { + url = repository; + rev = rev; + } +}: + +stdenv.mkDerivation rec { + name = "knetwork-manager-${version}"; + version = "live"; + + inherit src; + + buildInputs = [ + cmake kdelibs automoc4 networkmanager kdebase_workspace + ]; + + meta = with stdenv.lib; { + homepage = http://kde.org; + description = "KDE systray and plasma applet for network management."; + license = licenses.gplv2; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60c667ba38b..15daf4ed29d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -820,6 +820,8 @@ let kismet = callPackage ../applications/networking/sniffers/kismet { }; + knetworkmanager_live = newScope pkgs.kde4 ../tools/networking/knetworkmanager/live.nix { }; + less = callPackage ../tools/misc/less { }; most = callPackage ../tools/misc/most { };