diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix deleted file mode 100644 index 31dbfc9c23db..000000000000 --- a/pkgs/applications/emulators/tinyemu/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL -, curl -, openssl -}: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2019-12-21"; - - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; - }; - - buildInputs = [ - SDL - curl - openssl - ]; - - makeFlags = [ - "CC:=$(CC)" - "STRIP:=$(STRIP)" - "DESTDIR=$(out)" - "bindir=/bin" - ]; - - preInstall = '' - mkdir -p "$out/bin" - ''; - - meta = with lib; { - homepage = "https://bellard.org/tinyemu/"; - description = "System emulator for the RISC-V and x86 architectures"; - longDescription = '' - TinyEMU is a system emulator for the RISC-V and x86 architectures. Its - purpose is to be small and simple while being complete. - ''; - license = with licenses; [ mit bsd2 ]; - maintainers = with maintainers; [ jhhuh AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix new file mode 100644 index 000000000000..b36a0462c9d1 --- /dev/null +++ b/pkgs/by-name/ti/tinyemu/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + SDL, + curl, + openssl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/tinyemu-${finalAttrs.version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + nativeBuildInputs = [ SDL ]; + + buildInputs = [ + SDL + curl + openssl + ]; + + strictDeps = true; + + makeFlags = [ + "CC:=$(CC)" + "STRIP:=$(STRIP)" + "bindir=$(out)/bin" + ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = { + homepage = "https://bellard.org/tinyemu/"; + description = "System emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + + Main features: + + - RISC-V system emulator supporting the RV128IMAFDQC base ISA (user level + ISA version 2.2, priviledged architecture version 1.10) including: + - 32/64/128 bit integer registers + - 32/64/128 bit floating point instructions (using the SoftFP Library) + - Compressed instructions + - Dynamic XLEN change + - x86 system emulator based on KVM + - VirtIO console, network, block device, input and 9P filesystem + - Graphical display with SDL + - JSON configuration file + - Remote HTTP block device and filesystem + - Small code, easy to modify, few external dependancies + - Javascript version running Linux and Windows 2000. + ''; + license = with lib.licenses; [ + mit + bsd2 + ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d229ea8f730e..bb4a8810886f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2745,8 +2745,6 @@ with pkgs; tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/emulators/tinyemu { }; - uae = callPackage ../applications/emulators/uae { }; vbam = callPackage ../applications/emulators/vbam { };