multibootusb: python36Packages -> python3Packages

main
Martin Weinelt 3 years ago
parent 846e2b1919
commit e8239e87a2
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
  1. 20
      pkgs/applications/misc/multibootusb/default.nix

@ -1,6 +1,6 @@
{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:
python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:
# Note: Multibootusb is tricky to maintain. It relies on the
# $PYTHONPATH variable containing some of their code, so that
@ -13,7 +13,7 @@
#
# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59
python36Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "multibootusb";
name = "${pname}-${version}";
version = "9.2.0";
@ -42,7 +42,7 @@ python36Packages.buildPythonApplication rec {
buildInputs = [
libxcb
python36Packages.python
python3Packages.python
qt5.full
];
@ -58,12 +58,12 @@ python36Packages.buildPythonApplication rec {
# "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
doCheck = false;
pythonPath = [
python36Packages.dbus-python
python36Packages.pyqt5
python36Packages.pytest-shutil
python36Packages.pyudev
python36Packages.six
pythonPath = with python3Packages; [
dbus-python
pyqt5
pytest-shutil
pyudev
six
];
# multibootusb ships zips with various versions of syslinux, we need to patchelf them
@ -95,7 +95,7 @@ python36Packages.buildPythonApplication rec {
"''${qtWrapperArgs[@]}"
# Then, add the installed scripts/ directory to the python path
--prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"
--prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
# Add some runtime dependencies
--prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}"

Loading…
Cancel
Save