From b5cd0848bfe0abcaf7623923f7bf439356992950 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Jul 2023 20:46:21 -0300 Subject: [PATCH] fsuae-launcher: refactor - New rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942); - remove `with lib;` --- .../emulators/fs-uae/launcher.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 1f79cad8fc8e..570b439f4a1e 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -7,13 +7,13 @@ , fsuae }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fs-uae-launcher"; version = "3.1.68"; src = fetchurl { - url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; + url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; + hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; }; nativeBuildInputs = [ @@ -33,16 +33,17 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; preFixup = '' - wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \ - --prefix PATH : ${lib.makeBinPath [ fsuae ]} + wrapQtApp "$out/bin/fs-uae-launcher" \ + --set PYTHONPATH "$PYTHONPATH" \ + --prefix PATH : ${lib.makeBinPath [ fsuae ]} ''; - meta = with lib; { + meta = { homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander AndersonTorres ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +})