diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-07-29 22:07:58 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-07-30 02:56:21 +0000 |
| commit | 5d324bb27309b7040409f3bbc71185516827f024 (patch) | |
| tree | 3581664fd66974845fec3d56a5a19ff91b293958 | |
| parent | Merge pull request #183869 from NixOS/backport-183581-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-183867-to-release-22.05.tar.gz | |
openmsx: 17.0 -> 18.0origin/backport-183867-to-release-22.05
(cherry picked from commit 3cd154051017bd0f795f534fbd21a2458aa44838)
| -rw-r--r-- | pkgs/applications/emulators/openmsx/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index f054b954b59b..4dfa3b864430 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -13,26 +13,26 @@ , libpng , libtheora , libvorbis -, python +, python3 , tcl , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "17.0"; + version = "18.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-9PdUNahJZ2O6ASkzLW/uudP3hiIzTDpxzFy6Pjb8JiU="; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; + sha256 = "sha256-4V2B+OQbPVRmkRuqfeqyd+7pz9Z1YISjI79WqZS0Qhc="; fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config - python + python3 ]; buildInputs = [ @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e73b55b492b8..74d8b7426d19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1357,9 +1357,7 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - openmsx = callPackage ../applications/emulators/openmsx { - python = python3; - }; + openmsx = callPackage ../applications/emulators/openmsx { }; pcem = callPackage ../applications/emulators/pcem { }; |