svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32330

pkgs/tools/networking/knetworkmanager/live.nix

@@ -1,27 +0,0 @@
-{ 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.gpl2;
-    maintainers = with maintainers; [  phreedom ];
-  };
-}

pkgs/tools/networking/nbd/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ];
 
-  buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders;
+  buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
   postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
 

pkgs/tools/networking/networkmanagement/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager }:
+{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager, pkgconfig }:
 
 let
   pname = "networkmanagement";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ kdelibs kde_workspace networkmanager ];
-  buildNativeInputs = [ gettext ];
+  buildNativeInputs = [ gettext pkgconfig ];
 
   NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control";