punes: migrate to by-name (#425429)

authored by Cosima Neidahl and committed by GitHub 53c766af 2f2b5ef4

+25 -16
+18 -12
pkgs/applications/emulators/punes/default.nix pkgs/by-name/pu/punes/package.nix
··· 12 libX11, 13 libXrandr, 14 sndio, 15 - qtbase, 16 - qtsvg, 17 - qttools, 18 - wrapQtAppsHook, 19 }: 20 21 stdenv.mkDerivation (finalAttrs: { 22 pname = "punes"; 23 version = "0.111"; ··· 25 src = fetchFromGitHub { 26 owner = "punesemu"; 27 repo = "puNES"; 28 - rev = "v${finalAttrs.version}"; 29 hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds="; 30 }; 31 ··· 50 nativeBuildInputs = [ 51 cmake 52 pkg-config 53 qttools 54 wrapQtAppsHook 55 - ]; 56 57 buildInputs = [ 58 ffmpeg 59 libGLU 60 qtbase 61 qtsvg 62 - ] 63 ++ lib.optionals stdenv.hostPlatform.isLinux [ 64 alsa-lib 65 libX11 ··· 74 "-DENABLE_RELEASE=ON" 75 "-DENABLE_FFMPEG=ON" 76 "-DENABLE_OPENGL=ON" 77 - "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}" 78 ]; 79 80 passthru.updateScript = gitUpdater { 81 rev-prefix = "v"; 82 }; 83 84 - meta = with lib; { 85 description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; 86 mainProgram = "punes"; 87 homepage = "https://github.com/punesemu/puNES"; 88 changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog"; 89 - license = licenses.gpl2Plus; 90 - maintainers = with maintainers; [ OPNA2608 ]; 91 - platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows; 92 }; 93 })
··· 12 libX11, 13 libXrandr, 14 sndio, 15 + libsForQt5, 16 + qt6Packages, 17 + withQt6 ? false, 18 }: 19 20 + let 21 + qtPackages = if withQt6 then qt6Packages else libsForQt5; 22 + in 23 stdenv.mkDerivation (finalAttrs: { 24 pname = "punes"; 25 version = "0.111"; ··· 27 src = fetchFromGitHub { 28 owner = "punesemu"; 29 repo = "puNES"; 30 + tag = "v${finalAttrs.version}"; 31 hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds="; 32 }; 33 ··· 52 nativeBuildInputs = [ 53 cmake 54 pkg-config 55 + ] 56 + ++ (with qtPackages; [ 57 qttools 58 wrapQtAppsHook 59 + ]); 60 61 buildInputs = [ 62 ffmpeg 63 libGLU 64 + ] 65 + ++ (with qtPackages; [ 66 qtbase 67 qtsvg 68 + ]) 69 ++ lib.optionals stdenv.hostPlatform.isLinux [ 70 alsa-lib 71 libX11 ··· 80 "-DENABLE_RELEASE=ON" 81 "-DENABLE_FFMPEG=ON" 82 "-DENABLE_OPENGL=ON" 83 + (lib.strings.cmakeBool "ENABLE_QT6_LIBS" withQt6) 84 ]; 85 86 passthru.updateScript = gitUpdater { 87 rev-prefix = "v"; 88 }; 89 90 + meta = { 91 description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; 92 mainProgram = "punes"; 93 homepage = "https://github.com/punesemu/puNES"; 94 changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog"; 95 + license = lib.licenses.gpl2Plus; 96 + maintainers = with lib.maintainers; [ OPNA2608 ]; 97 + platforms = with lib.platforms; linux ++ freebsd ++ openbsd ++ windows; 98 }; 99 })
+7
pkgs/by-name/pu/punes-qt6/package.nix
···
··· 1 + { 2 + punes, 3 + }: 4 + 5 + punes.override { 6 + withQt6 = true; 7 + }
-4
pkgs/top-level/all-packages.nix
··· 1418 in 1419 ppsspp.override argset; 1420 1421 - punes = libsForQt5.callPackage ../applications/emulators/punes { }; 1422 - 1423 - punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { }; 1424 - 1425 py65 = with python3.pkgs; toPythonApplication py65; 1426 1427 rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
··· 1418 in 1419 ppsspp.override argset; 1420 1421 py65 = with python3.pkgs; toPythonApplication py65; 1422 1423 rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {