diff --git a/pkgs/desktops/kde-4.4/base-runtime/default.nix b/pkgs/desktops/kde-4.4/base-runtime/default.nix index 21111efb6c2b..65c6235a5629 100644 --- a/pkgs/desktops/kde-4.4/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info +{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info, exiv2, libssh , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}: stdenv.mkDerivation { @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1zrwkf2l7nq0z4a9pm2plkynys65h77ai4s3cqlvzwlwhf4l3f1z"; }; /* CLUCENE_HOME=cluceneCore;*/ - buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info + # Still have to look into Soprano Virtuoso + buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info exiv2 libssh kdelibs automoc4 phonon strigi soprano cluceneCore attica ]; meta = { description = "KDE runtime"; diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 3d513f770bff..181d6f949fe5 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -82,7 +82,7 @@ pkgs.recurseIntoAttrs (rec { }; kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4; + inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4 exiv2 libssh; inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore; inherit kdelibs attica; inherit automoc4 phonon strigi soprano; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix new file mode 100644 index 000000000000..454e7ce9191c --- /dev/null +++ b/pkgs/development/libraries/libssh/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, cmake, zlib, openssl}: + +stdenv.mkDerivation { + name = "libssh-0.4.1"; + src = fetchurl { + url = http://www.libssh.org/files/libssh-0.4.1.tar.gz; + sha256 = "0f12iyzwc2w5m5y1b6jzr08516vpfwwwrqqd4dkb6b0q2a1axlm6"; + }; + buildInputs = [ cmake zlib openssl ]; + meta = { + description = "SSH client library"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b51d210b8765..b60b862667da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4381,6 +4381,10 @@ let inherit fetchurl stdenv; }; + libssh = import ../development/libraries/libssh { + inherit stdenv fetchurl cmake zlib openssl; + }; + libtasn1 = import ../development/libraries/libtasn1 { inherit fetchurl stdenv; };