Merge pull request #117570 from FRidh/python2alias

Python: be explicit on whether it is python2 or python3 that is used
This commit is contained in:
Frederik Rietdijk
2021-03-25 13:26:35 +01:00
committed by GitHub
70 changed files with 260 additions and 170 deletions
+5 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, pythonPackages
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, python3Packages
, libevdev
}:
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ];
buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ];
buildInputs = [ python3Packages.evdev libevdev ];
strictDeps = true;
meta = with lib; {
description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
+4 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
, libaio, python, zlib
, libaio, python3, zlib
, withGnuplot ? false, gnuplot ? null }:
stdenv.mkDerivation rec {
@@ -13,11 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ=";
};
buildInputs = [ python zlib ]
buildInputs = [ python3 zlib ]
++ lib.optional (!stdenv.isDarwin) libaio;
nativeBuildInputs = [ makeWrapper ];
strictDeps = true;
enableParallelBuilding = true;
postPatch = ''