From 6857e5dff352e1e5fda1b6e2fc33b69ac3b38bd9 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Mon, 7 Aug 2023 21:20:02 +0100 Subject: [PATCH] easyabc: pin wxPython --- pkgs/applications/audio/easyabc/default.nix | 26 +++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix index 94d8e83080b4..54b1f31d1c11 100644 --- a/pkgs/applications/audio/easyabc/default.nix +++ b/pkgs/applications/audio/easyabc/default.nix @@ -1,7 +1,23 @@ -{ lib, fetchFromGitHub, substituteAll, makeWrapper, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }: +{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }: -# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52 -python39.pkgs.buildPythonApplication { +let + # requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52 + python = python39.override { + self = python; + packageOverrides = self: super: { + # currently broken with 4.2.1 + # https://github.com/jwdj/EasyABC/issues/75 + wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec { + version = "4.2.0"; + src = fetchPypi { + inherit version; + pname = "wxPython"; + hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc="; + }; + }); + }; + }; +in python.pkgs.buildPythonApplication { pname = "easyabc"; version = "1.3.8.6"; @@ -14,7 +30,7 @@ python39.pkgs.buildPythonApplication { nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = with python39.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ cx-freeze wxPython_4_2 pygame @@ -48,7 +64,7 @@ python39.pkgs.buildPythonApplication { ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps - makeWrapper ${python39.interpreter} $out/bin/easyabc \ + makeWrapper ${python.interpreter} $out/bin/easyabc \ --set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \ --add-flags "-O $out/share/easyabc/easy_abc.py"