public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gajim: make OpenSSL code work

Browse Source
This commit is contained in:
Michael Raskin 2012-09-13 18:02:41 +04:00
parent 947741de5f
commit 8b7d12d0f5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -8,7 +8,7 @@ let
pkgconfig makeWrapper libglade pyopenssl libXScrnSaver pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
libXt xproto libXext xextproto libX11 gtkspell aspell libXt xproto libXext xextproto libX11 gtkspell aspell
scrnsaverproto pycrypto pythonDBus pythonSexy scrnsaverproto pycrypto pythonDBus pythonSexy
docutils docutils pyasn1
]; ];
in in
rec { rec {
@ -37,8 +37,14 @@ rec {
done done
'') ["wrapBinContentsPython"]; '') ["wrapBinContentsPython"];
deploySource = a.fullDepEntry (''
mkdir -p "$out/share/gajim/src"
cp -r * "$out/share/gajim/src"
'') ["minInit"];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython" "fixScriptNames"]; phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall"
"wrapBinContentsPython" "fixScriptNames" "deploySource"];
name = "gajim-" + version; name = "gajim-" + version;
meta = { meta = {

6
pkgs/development/python-modules/pyopenssl/default.nix
View File

@ -2,15 +2,15 @@ a :
let let
fetchurl = a.fetchurl; fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.10" a; version = a.lib.attrByPath ["version"] "0.13" a;
propagatedBuildInputs = with a; [ propagatedBuildInputs = with a; [
openssl python openssl python
]; ];
in in
rec { rec {
src = fetchurl { src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.10.tar.gz"; url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
sha256 = "4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60"; sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b";
}; };
inherit propagatedBuildInputs; inherit propagatedBuildInputs;

1
pkgs/top-level/all-packages.nix
View File

@ -8696,6 +8696,7 @@ let
inherit (gnome) libglade; inherit (gnome) libglade;
inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11
scrnsaverproto; scrnsaverproto;
inherit (pythonPackages) pyasn1;
python = pythonFull; python = pythonFull;
}; };