diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 14:28:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 14:28:26 +0200 |
commit | e4b47de69411437a563391a34dda300fee1b006b (patch) | |
tree | e4eeb46dbdbc0a85fd3f52784c2278a4ce4a5119 /pkgs/applications | |
parent | b54b5a90e40aaeca25079eea0a1ec130613ed5e9 (diff) |
Remove top-level pycrypto
See #11567.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/screencloud/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 5934febb99996..6f2b0e34cbb34 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python, pycrypto, glib }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; }; - buildInputs = [ cmake qt4 quazip qt-mobility qxt python pycrypto ]; + buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs $prefix/opt/screencloud/screencloud.sh substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" + sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" mkdir $prefix/bin mkdir $prefix/lib ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 056edd801c074..775d344643e37 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,10 +3,13 @@ , libctemplate, libglade , libiodbc , libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo +, pango, pcre, pkgconfig, sqlite, sudo +, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pexpect pycrypto python paramiko; +in stdenv.mkDerivation rec { pname = "mysql-workbench"; version = "5.2.47"; name = "${pname}-${version}"; |