diff options
| author | Lucas Ransan <lucas@ransan.tk> | 2022-08-30 10:44:00 +0200 |
|---|---|---|
| committer | Lucas Ransan <lucas@ransan.tk> | 2022-08-30 10:44:00 +0200 |
| commit | 31161d2fd2f7b33b077c46c171e1bd26a6420384 (patch) | |
| tree | b893c97378cbe4616760423f5b92c10a59b6bb47 | |
| parent | 1cc8a7ba8844f68a646da509a3976b52f406a28c (diff) | |
| download | nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar.gz nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar.bz2 nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar.lz nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar.xz nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.tar.zst nixpkgs-31161d2fd2f7b33b077c46c171e1bd26a6420384.zip | |
cemu-ti: 1.3 -> unstable-2022-06-29
| -rw-r--r-- | pkgs/applications/science/math/cemu-ti/default.nix (renamed from pkgs/applications/science/math/cemu/default.nix) | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 22 deletions
diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index 374b245e249..426cb68b223 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -1,52 +1,40 @@ -{ fetchFromGitHub +{ stdenv , lib -, SDL2 -, libGL -, libarchive -, libusb-compat-0_1 -, qtbase +, fetchFromGitHub , qmake -, git -, libpng , pkg-config , wrapQtAppsHook -, stdenv +, libarchive +, libpng }: stdenv.mkDerivation rec { pname = "CEmu"; - version = "1.3"; + version = "unstable-2022-06-29"; src = fetchFromGitHub { owner = "CE-Programming"; repo = "CEmu"; - rev = "v${version}"; - sha256 = "1wcdnzcqscawj6jfdj5wwmw9g9vsd6a1rx0rrramakxzf8b7g47r"; + rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; + hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake - git wrapQtAppsHook pkg-config ]; buildInputs = [ - SDL2 - libGL libarchive - libusb-compat-0_1 - qtbase libpng ]; qmakeFlags = [ "gui/qt" - "CONFIG+=ltcg" ]; meta = with lib; { - changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}"; description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; homepage = "https://ce-programming.github.io/CEmu"; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0aa3a6fc624..5f88657fc49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4938,9 +4938,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; - cemu = qt5.callPackage ../applications/science/math/cemu { - stdenv = gcc9Stdenv; - }; + cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; cider = callPackage ../applications/audio/cider { }; |