- Added libssh (used by kdebase-runtime)
- Completed kdebase-runtime 4.4.0 svn path=/nixpkgs/trunk/; revision=19994
This commit is contained in:
parent
7b17fdc916
commit
019db7b9dc
@ -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";
|
||||
|
@ -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;
|
||||
|
15
pkgs/development/libraries/libssh/default.nix
Normal file
15
pkgs/development/libraries/libssh/default.nix
Normal file
@ -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 ];
|
||||
};
|
||||
}
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user