|
17 | 17 | qt5.wrapQtAppsHook |
18 | 18 | libsForQt5.breeze-qt5 |
19 | 19 | libsForQt5.qt5ct |
20 | | - customPythonPackages.pkgs.opencv4 |
21 | | - customPythonPackages.pkgs.simplification |
22 | 20 | (python39.withPackages (p: with p; [ |
23 | | - coloredlogs |
24 | | - cryptography |
25 | | - matplotlib |
26 | | - mpv |
27 | | - pillow |
28 | | - pip |
29 | | - playsound |
30 | | - pynput |
31 | | - pyqt5 |
32 | | - pyqtgraph |
33 | | - pyyaml |
34 | | - scipy |
35 | | - screeninfo |
36 | | - GitPython |
| 21 | + customPythonPackages.pkgs.opencv4 |
| 22 | + customPythonPackages.pkgs.simplification |
| 23 | + customPythonPackages.pkgs.coloredlogs |
| 24 | + customPythonPackages.pkgs.cryptography |
| 25 | + customPythonPackages.pkgs.matplotlib |
| 26 | + customPythonPackages.pkgs.mpv |
| 27 | + customPythonPackages.pkgs.pillow |
| 28 | + customPythonPackages.pkgs.pip |
| 29 | + customPythonPackages.pkgs.playsound |
| 30 | + customPythonPackages.pkgs.pynput |
| 31 | + customPythonPackages.pkgs.pyqt5 |
| 32 | + customPythonPackages.pkgs.pyqtgraph |
| 33 | + customPythonPackages.pkgs.pyyaml |
| 34 | + customPythonPackages.pkgs.scipy |
| 35 | + customPythonPackages.pkgs.screeninfo |
| 36 | + customPythonPackages.pkgs.GitPython |
37 | 37 | ])) |
38 | 38 | ]; |
39 | 39 | libPath = pkgs.lib.makeLibraryPath mtfgDependencies; |
|
65 | 65 | pkgs.python39.override { inherit packageOverrides; self = customPythonPackages; }; |
66 | 66 | in |
67 | 67 | { |
68 | | - packages.${system}.mtfg = pkgs.stdenv.mkDerivation { |
69 | | - pname = "MTFG"; |
| 68 | + packages.${system}.mtfg = pkgs.python39Packages.buildPythonPackage { |
| 69 | + pname = "funscript-editor"; |
70 | 70 | version = "0.5.3"; |
71 | 71 | src = pkgs.fetchgit { |
72 | 72 | url = "https://github.com/michael-mueller-git/Python-Funscript-Editor.git"; |
73 | | - rev = "5b049018f20f8d3e90413d663e47c7120dec99a7"; |
74 | | - sha256 = "sha256-q2ew4rmZV7G5HgoQq4ZAuEf+GRMVuq+K+yc/WBEWsPM="; |
| 73 | + rev = "0b6b02c1c57ceb970197a7215d910115a18d4056"; |
| 74 | + sha256 = "sha256-bdaPoDQEykKC8Y5bJ/SfiVj4JJhaXVvBMMqHzSix7ZQ="; |
75 | 75 | }; |
76 | | - buildInputs = mtfgDependencies; |
| 76 | + propagatedBuildInputs = mtfgDependencies; |
| 77 | + QT_QPA_PLATFORM = "xcb"; |
77 | 78 | nativeBuildInputs = with pkgs; [ |
78 | 79 | makeWrapper |
79 | | - python39Packages.wrapPython |
80 | 80 | ]; |
81 | | - QT_QPA_PLATFORM = "xcb"; |
82 | 81 | postInstall = '' |
83 | | - mkdir -p "$out/bin" |
84 | | - cp -rfv "$src/." "$out" |
85 | | - cp -rfv "$out/main.py" "$out/bin/MTFG" |
86 | | - chmod +x "$out/bin/MTFG" |
87 | | - wrapPythonPrograms $out |
| 82 | + wrapProgram "$out/bin/funscript-editor" --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" |
88 | 83 | ''; |
89 | | - |
90 | 84 | }; |
91 | 85 | defaultPackage.${system} = self.packages.x86_64-linux.mtfg; |
92 | 86 | formatter.${system} = pkgs.nixpkgs-fmt; |
|
0 commit comments