diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4/libs/default.nix index b714977bd73..4c0574c9c74 100644 --- a/pkgs/desktops/kde-4/libs/default.nix +++ b/pkgs/desktops/kde-4/libs/default.nix @@ -9,14 +9,15 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - cmake inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto + inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat libtool freetype bzip2 shared_mime_info alsaLib libungif cups - gettext enchant openexr aspell stdenv.gcc.libc + gettext enchant openexr aspell stdenv.gcc.libc jasper ] ++ kdesupport.all; + buildInputs = [ cmake ]; patchPhase = "cp ${findIlmBase} ../cmake/modules/FindIlmBase.cmake; cp $findOpenEXR ../cmake/modules/FindOpenEXR.cmake; sed -e 's@Soprano/DummyModel@Soprano/Util/DummyModel@' -i ../nepomuk/core/resourcemanager.cpp;"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30866d49315..2f6440f89c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4681,7 +4681,7 @@ rec { shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline saneBackends chmlib python libzip gmp sqlite libidn runCommand lib - openbabel ocaml facile stdenv poppler_data; + openbabel ocaml facile stdenv poppler_data jasper; cdparanoia = cdparanoiaIII; inherit (xlibs) inputproto kbproto scrnsaverproto xextproto xf86miscproto