diff options
author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-02-15 18:03:27 +0000 |
---|---|---|
committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-02-15 18:03:27 +0000 |
commit | 1ec8a7412a5a77c26cd6787c3ca7afb2980848c8 (patch) | |
tree | 420e481f97a3c853053bd1d9f323746f5695ada6 /pkgs | |
parent | 7390c0e31fc84da6dd8c98d190654a4931b8db36 (diff) | |
download | nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar.gz nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar.bz2 nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar.lz nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar.xz nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.tar.zst nixlib-1ec8a7412a5a77c26cd6787c3ca7afb2980848c8.zip |
Fixed compilation of kdeplasma-addons by passing libXi as buildInput
svn path=/nixpkgs/trunk/; revision=20021
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.4/plasma-addons/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 7e810d301a8e..616a15aeb06d 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -168,7 +168,7 @@ pkgs.recurseIntoAttrs (rec { kdeplasma_addons = import ./plasma-addons { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info; - inherit (pkgs.xlibs) libXtst; + inherit (pkgs.xlibs) libXtst libXi; inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu; inherit automoc4 phonon soprano eigen qimageblitz attica; }; diff --git a/pkgs/desktops/kde-4.4/plasma-addons/default.nix b/pkgs/desktops/kde-4.4/plasma-addons/default.nix index 2549dadb3b4a..f0fcbfcc3a62 100644 --- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info, libXtst +{ stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info, libXtst, libXi , kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics, kdeedu , automoc4, phonon, soprano, eigen, qimageblitz, attica}: @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit kdebase_workspace; builder = ./builder.sh; KDEDIRS="${kdeedu}"; - buildInputs = [ cmake qt4 perl python shared_mime_info libXtst + buildInputs = [ cmake qt4 perl python shared_mime_info libXtst libXi kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu automoc4 phonon soprano eigen qimageblitz attica ]; meta = { |