pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #294638 from atorres1985-contrib/fsuae

fsuae: refactor

authored by Weijia Wang and committed by GitHub c9d54fc5 1f518009

+22 -19
unified split
+8 -4
pkgs/applications/emulators/fs-uae/default.nix pkgs/by-name/fs/fsuae/package.nix
··· 1 1 { lib 2 - , stdenv 3 - , fetchFromGitHub 4 2 , SDL2 5 3 , autoreconfHook 4 + , fetchFromGitHub 6 5 , freetype 7 6 , gettext 8 7 , glib ··· 13 12 , lua 14 13 , openal 15 14 , pkg-config 15 + , stdenv 16 16 , zip 17 17 , zlib 18 18 }: ··· 31 31 nativeBuildInputs = [ 32 32 autoreconfHook 33 33 pkg-config 34 + zip 34 35 ]; 35 36 36 37 buildInputs = [ ··· 44 45 libmpeg2 45 46 lua 46 47 openal 47 - zip 48 48 zlib 49 49 ]; 50 50 51 + strictDeps = true; 52 + 51 53 meta = { 52 54 homepage = "https://fs-uae.net"; 53 55 description = "An accurate, customizable Amiga Emulator"; ··· 58 60 Amigas. 59 61 ''; 60 62 license = lib.licenses.gpl2Plus; 63 + mainProgram = "fs-uae"; 61 64 maintainers = with lib.maintainers; [ AndersonTorres ]; 62 - platforms = [ "i686-linux" "x86_64-linux" ]; 65 + platforms = with lib.systems.inspect; 66 + patternLogicalAnd patterns.isx86 patterns.isLinux; 63 67 }; 64 68 })
+14 -11
pkgs/applications/emulators/fs-uae/launcher.nix pkgs/by-name/fs/fsuae-launcher/package.nix
··· 1 1 { lib 2 - , stdenv 3 2 , fetchurl 3 + , fsuae 4 4 , gettext 5 - , python3 6 - , wrapQtAppsHook 7 - , fsuae 5 + , python3Packages 6 + , stdenv 7 + , libsForQt5 8 8 }: 9 9 10 10 stdenv.mkDerivation (finalAttrs: { 11 11 pname = "fs-uae-launcher"; 12 - version = "3.1.68"; 12 + version = "3.1.70"; 13 13 14 14 src = fetchurl { 15 15 url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; 16 - hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; 16 + hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ 20 20 gettext 21 - python3 22 - wrapQtAppsHook 21 + python3Packages.python 22 + libsForQt5.wrapQtAppsHook 23 23 ]; 24 24 25 - buildInputs = with python3.pkgs; [ 25 + buildInputs = with python3Packages; [ 26 26 pyqt5 27 27 requests 28 28 setuptools 29 29 ]; 30 + 31 + strictDeps = true; 30 32 31 33 makeFlags = [ "prefix=$(out)" ]; 32 34 ··· 47 49 homepage = "https://fs-uae.net"; 48 50 description = "Graphical front-end for the FS-UAE emulator"; 49 51 license = lib.licenses.gpl2Plus; 52 + mainProgram = "fs-uae-launcher"; 50 53 maintainers = with lib.maintainers; [ sander AndersonTorres ]; 51 - platforms = [ "i686-linux" "x86_64-linux" ]; 54 + platforms = with lib.systems.inspect; 55 + patternLogicalAnd patterns.isx86 patterns.isLinux; 52 56 }; 53 57 }) 54 -
-4
pkgs/top-level/all-packages.nix
··· 2692 2692 2693 2693 fsrx = callPackage ../tools/misc/fsrx { }; 2694 2694 2695 - fsuae = callPackage ../applications/emulators/fs-uae { }; 2696 - 2697 - fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; 2698 - 2699 2695 fuc = callPackage ../tools/misc/fuc { }; 2700 2696 2701 2697 fuse-emulator = callPackage ../applications/emulators/fuse-emulator { };