linien-gui: fix build

+28 -12
+18 -4
pkgs/by-name/li/linien-gui/package.nix
··· 4 4 qt5, 5 5 }: 6 6 7 - python3.pkgs.buildPythonApplication rec { 7 + let 8 + python = python3.override { 9 + self = python; 10 + packageOverrides = self: super: { 11 + numpy = super.numpy_1; 12 + }; 13 + }; 14 + in 15 + python.pkgs.buildPythonApplication rec { 8 16 pname = "linien-gui"; 9 17 pyproject = true; 10 18 11 - inherit (python3.pkgs.linien-common) src version; 19 + inherit (python.pkgs.linien-common) src version; 12 20 13 21 sourceRoot = "${src.name}/linien-gui"; 14 22 15 - build-system = with python3.pkgs; [ 23 + build-system = with python.pkgs; [ 16 24 setuptools 17 25 ]; 18 26 nativeBuildInputs = [ ··· 25 33 qt5.qtwayland 26 34 ]; 27 35 28 - dependencies = with python3.pkgs; [ 36 + dependencies = with python.pkgs; [ 29 37 appdirs 30 38 click 31 39 pyqtgraph ··· 40 48 preFixup = '' 41 49 makeWrapperArgs+=("''${qtWrapperArgs[@]}") 42 50 ''; 51 + 52 + passthru = { 53 + # Useful for creating .withPackages environments, see NOTE near 54 + # `python3Packages.linien-common.meta.broken`. 55 + inherit python; 56 + }; 43 57 44 58 meta = { 45 59 description = "Graphical user interface of the Linien spectroscopy lock application";
+10 -8
pkgs/development/python-modules/linien-common/default.nix
··· 70 70 # 71 71 # To evaluate this package with python3.withPackages, use: 72 72 # 73 - # pythonEnv = python3.override { 74 - # packageOverrides = self: super: { 75 - # numpy = super.numpy_1; 76 - # }; 77 - # }.withPackages(ps: { 73 + # pythonEnv = pkgs.linien-gui.passthru.python.withPackages(ps: { 78 74 # ps.linien-common 79 75 # # Other packages... 80 76 # }); 81 77 # 82 78 # NOTE that the above Python environment will use Numpy 1 throughout all 83 - # packages wrapped there, and this may trigger rebuilds for dependencies 84 - # that depend on Numpy too. Be ready to also add more `packageOverrides` to 85 - # make sure these other dependencies do build with numpy_1. 79 + # packages wrapped there (see expression in linien-gui), and this may 80 + # trigger rebuilds for dependencies that depend on Numpy too. Be ready to 81 + # also add more `packageOverrides` to make sure these other dependencies do 82 + # build with numpy_1. 83 + # 84 + # Last NOTE: If you need more packageOverrides besides those provided in 85 + # the `linien-gui` expression, beware of: 86 + # 87 + # - https://github.com/NixOS/nixpkgs/issues/44426 86 88 broken = lib.versionAtLeast numpy.version "2"; 87 89 }; 88 90 }