diff options
author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-08-24 09:54:42 +0000 |
---|---|---|
committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-08-24 09:54:42 +0000 |
commit | 975db72a729995206324b6c28932bfdaee3cfa7c (patch) | |
tree | ca1d1c1ecb81b1af8d5d9b24869195f2d9989db4 /pkgs/system/all-packages-generic.nix | |
parent | 49220563dffdc26fe765c2e971840d7fa2ff8cfa (diff) | |
download | nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar.gz nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar.bz2 nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar.lz nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar.xz nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.tar.zst nixpkgs-975db72a729995206324b6c28932bfdaee3cfa7c.zip |
Added Mozilla NSS, NSPR and Gaim to Nix. Gaim in Nix supports SSL
svn path=/nixpkgs/trunk/; revision=3676
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 7f59b53a41b..3b8da4d2112 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -693,6 +693,10 @@ rec { inherit fetchurl stdenv perl; }; + nss = (import ../development/libraries/nss) { + inherit fetchurl stdenv perl zip; + }; + freetype = (import ../development/libraries/freetype) { inherit fetchurl stdenv; }; @@ -1253,11 +1257,10 @@ rec { inherit fetchurl stdenv ncurses openssl; }; -/* - kopete = (import ../applications/networking/instant-messengers/kopete) { - inherit fetchurl stdenv xlibs zlib libjpeg perl qt3; + gaim = (import ../applications/networking/instant-messengers/gaim) { + inherit fetchurl stdenv pkgconfig perl libxml2 openssl nss; + inherit (gtkLibs) glib gtk; }; -*/ cdparanoiaIII = (import ../applications/audio/cdparanoia) { inherit fetchurl stdenv; |