diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 33b97d5cfb5..1f346c99403 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -1,7 +1,7 @@ pkgs: pkgs.recurseIntoAttrs (rec { - inherit (pkgs) qt4; + inherit (pkgs) qt4 stdenv; ### SUPPORT automoc4 = import ./support/automoc4 { diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 79d9036e2ad..7ccbc75a0e3 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -3,15 +3,13 @@ { recurseForRelease = true; - inherit callPackage; + inherit callPackage stdenv; qt4 = qt47; phonon = null; - kde = import ./kde-package { - inherit stdenv fetchurl; - }; + kde = callPackage ./kde-package { }; ### SUPPORT akonadi = callPackage ./support/akonadi { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95197816baa..76a2b929205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5791,9 +5791,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { - stdenv = stdenv2; - }; + kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; @@ -6687,8 +6685,8 @@ let inherit (pkgs.kde45) qt4 kdelibs; }; shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; }; - stdenv = pkgs.stdenv2; } // pkgs.kde45); + stdenv = pkgs.stdenv2; }; xfce = xfce4;