diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-18 16:26:34 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-18 16:26:34 +0000 |
| commit | 024c2478075b24afcb3ba67fd96d7af6397782e3 (patch) | |
| tree | 2ee54ff27506807ff2054fea1340e6d516aa4b98 /pkgs/desktops | |
| parent | 14a5b4991cd6439438582130c39fba416e128935 (diff) | |
| download | nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar.gz nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar.bz2 nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar.lz nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar.xz nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.tar.zst nixlib-024c2478075b24afcb3ba67fd96d7af6397782e3.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.7/kde-runtime.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 96b6c3a1c784..d827802bb090 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack +, libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack + samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; |