From d5dede7ae874ca0f4af925ae3cb33d1f32ef807b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 20:19:59 -0300 Subject: [PATCH] fsuae-launcher: refactor --- pkgs/misc/emulators/fs-uae/launcher.nix | 29 +++++++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/misc/emulators/fs-uae/launcher.nix index 9416e92e2b02..afe12aab0c83 100644 --- a/pkgs/misc/emulators/fs-uae/launcher.nix +++ b/pkgs/misc/emulators/fs-uae/launcher.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchurl, makeWrapper, python3, gettext -, pyqt5, setuptools, requests +{ lib +, stdenv +, fetchurl +, gettext +, makeWrapper +, python3 }: stdenv.mkDerivation rec { @@ -11,18 +15,29 @@ stdenv.mkDerivation rec { sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; }; + nativeBuildInputs = [ + gettext + makeWrapper + python3 + ]; + + buildInputs = with python3.pkgs; [ + pyqt5 + requests + setuptools + ]; + makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ makeWrapper python3 gettext ]; - buildInputs = [ pyqt5 setuptools requests ]; + postInstall = '' wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" ''; - meta = { + meta = with lib; { + homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; license = lib.licenses.gpl2Plus; - homepage = "https://fs-uae.net"; - maintainers = with lib; [ maintainers.sander ]; + maintainers = with maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6a11213afb2..3552a8da14ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33195,9 +33195,7 @@ with pkgs; fsuae = callPackage ../misc/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { - inherit (python3Packages) pyqt5 setuptools requests; - }; + fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11;