git.iko.soy/typeable/nixpkgs
on master help sign in
fsuae-launcher: refactor
commitd5dede7ae874ca0f4af925ae3cb33d1f32ef807b authorAndersonTorres <torres.anderson.85@protonmail.com> dateMon 3 Jan 2022, 20:19 (5 years ago) parentb00ebad
2 files changed+23−10
pkgs/misc/emulators/fs-uae/launcher.nix+22−7 pkgs/top-level/all-packages.nix+1−3
pkgs/misc/emulators/fs-uae/launcher.nix+22−7
@@ -1,5 +1,9 @@
1−{ stdenv, lib, fetchurl, makeWrapper, python3, gettext
2−, pyqt5, setuptools, requests
1+{ lib
2+, stdenv
3+, fetchurl
4+, gettext
5+, makeWrapper
6+, python3
37}:
48
59stdenv.mkDerivation rec {
@@ -11,18 +15,29 @@ stdenv.mkDerivation rec {
1115 sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
1216 };
1317
18+ nativeBuildInputs = [
19+ gettext
20+ makeWrapper
21+ python3
22+ ];
23+
24+ buildInputs = with python3.pkgs; [
25+ pyqt5
26+ requests
27+ setuptools
28+ ];
29+
1430 makeFlags = [ "prefix=$(out)" ];
15− nativeBuildInputs = [ makeWrapper python3 gettext ];
16− buildInputs = [ pyqt5 setuptools requests ];
31+
1732 postInstall = ''
1833 wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
1934 '';
2035
21− meta = {
36+ meta = with lib; {
37+ homepage = "https://fs-uae.net";
2238 description = "Graphical front-end for the FS-UAE emulator";
2339 license = lib.licenses.gpl2Plus;
24− homepage = "https://fs-uae.net";
25− maintainers = with lib; [ maintainers.sander ];
40+ maintainers = with maintainers; [ sander AndersonTorres ];
2641 platforms = [ "i686-linux" "x86_64-linux" ];
2742 };
2843}
pkgs/top-level/all-packages.nix+1−3
@@ -33195,9 +33195,7 @@ with pkgs;
3319533195
3319633196 fsuae = callPackage ../misc/emulators/fs-uae { };
3319733197
33198− fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix {
33199− inherit (python3Packages) pyqt5 setuptools requests;
33200− };
33198+ fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { };
3320133199
3320233200 putty = callPackage ../applications/networking/remote/putty {
3320333201 gtk2 = gtk2-x11;