From 45a92833bd26ecb487a990496bc301504fd216da Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 15 Feb 2010 22:20:05 +0000 Subject: [PATCH] Added rhpl as buildInput to kdeutils so that system-config-printer can be used svn path=/nixpkgs/trunk/; revision=20032 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/utils/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 5748581a194..6dd0b610ecb 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -186,7 +186,7 @@ pkgs.recurseIntoAttrs (rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer; inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; }; diff --git a/pkgs/desktops/kde-4.4/utils/default.nix b/pkgs/desktops/kde-4.4/utils/default.nix index 86815c3583b..956c44e78c0 100644 --- a/pkgs/desktops/kde-4.4/utils/default.nix +++ b/pkgs/desktops/kde-4.4/utils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz -, sip, pyqt4, pycups, system_config_printer +, sip, pyqt4, pycups, rhpl, system_config_printer , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit system_config_printer; - buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer + buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; meta = {