Skip to content

Commit

Permalink
qemu-screamer: try fixing distutils.version.LooseVersion reference
Browse files Browse the repository at this point in the history
  • Loading branch information
Rhys-T committed Nov 5, 2024
1 parent 2a72f16 commit 6de78b5
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/qemu-screamer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
, nixosTestRunner ? false
, doCheck ? false
# SCREAMER:
, fetchFromGitHub, callPackage, maintainers
, fetchFromGitHub, callPackage, maintainers, ripgrep
# SCREAMER: renamed
, qemu-screamer # for passthru.tests
}:
Expand All @@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
+ lib.optionalString xenSupport "-xen"
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests";
# SCREAMER: renamed
# SCREAMER:
version = "7.1.94-unstable-2022-12-09";

# SCREAMER:
Expand All @@ -75,6 +75,8 @@ stdenv.mkDerivation rec {

# Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme
# SCREAMER: distutils is gone
python3Packages.looseversion
]
++ lib.optionals gtkSupport [ wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ sigtool ];
Expand Down Expand Up @@ -152,6 +154,8 @@ stdenv.mkDerivation rec {
# Otherwise tries to ensure /var/run exists.
sed -i "/install_emptydir(get_option('localstatedir') \/ 'run')/d" \
qga/meson.build
# SCREAMER: distutils is gone
substituteInPlace docs/conf.py --replace-fail 'from distutils.version import LooseVersion' 'from looseversion import LooseVersion'
'';

preConfigure = ''
Expand Down

0 comments on commit 6de78b5

Please sign in to comment.