diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-03-25 13:26:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 13:26:35 +0100 |
| commit | 350f9bd822e1c5017482e6364dbafda36ff4157a (patch) | |
| tree | 41f6c6c5f7ff38584f5091004c40cec14f908b00 /pkgs/applications/networking | |
| parent | c0e881852006b132236cbf0301bd1939bb50867e (diff) | |
| parent | f0754b8ab8b4969ff49e2436c6c8f12120c13ad8 (diff) | |
Merge pull request #117570 from FRidh/python2alias
Python: be explicit on whether it is python2 or python3 that is used
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/bitlbee/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/blink/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 1a83a04a1fa8b..c5a718c3a7023 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2 , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; - buildInputs = [ gnutls libotr python ] + buildInputs = [ gnutls libotr python2 ] ++ optional enableLibPurple pidgin ++ optional enablePam pam; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 3ee835610f79b..805278b4e4562 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, fetchdarcs, python2Packages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: -mkDerivationWith pythonPackages.buildPythonApplication rec { +mkDerivationWith python2Packages.buildPythonApplication rec { pname = "blink"; version = "3.2.0"; @@ -17,7 +17,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pyqt5_with_qtwebkit cjson sipsimple @@ -26,7 +26,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ]; buildInputs = [ - pythonPackages.cython + python2Packages.cython zlib libvncserver libvpx |