pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #188939 from luc65r/cemu-ti

cemu-ti: 1.3 -> unstable-2022-06-29

authored by

Thiago Kenji Okada and committed by
GitHub 2e7242bb 41004f4e

+9 -23
unified split
+8 -20
pkgs/applications/science/math/cemu/default.nix pkgs/applications/science/math/cemu-ti/default.nix
··· 1 - { fetchFromGitHub 1 + { stdenv 2 2 , lib 3 - , SDL2 4 - , libGL 5 - , libarchive 6 - , libusb-compat-0_1 7 - , qtbase 3 + , fetchFromGitHub 8 4 , qmake 9 - , git 10 - , libpng 11 5 , pkg-config 12 6 , wrapQtAppsHook 13 - , stdenv 7 + , libarchive 8 + , libpng 14 9 }: 15 10 16 11 stdenv.mkDerivation rec { 17 12 pname = "CEmu"; 18 - version = "1.3"; 13 + version = "unstable-2022-06-29"; 19 14 src = fetchFromGitHub { 20 15 owner = "CE-Programming"; 21 16 repo = "CEmu"; 22 - rev = "v${version}"; 23 - sha256 = "1wcdnzcqscawj6jfdj5wwmw9g9vsd6a1rx0rrramakxzf8b7g47r"; 17 + rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; 18 + hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; 24 19 fetchSubmodules = true; 25 20 }; 26 21 27 22 nativeBuildInputs = [ 28 23 qmake 29 - git 30 24 wrapQtAppsHook 31 25 pkg-config 32 26 ]; 33 27 34 28 buildInputs = [ 35 - SDL2 36 - libGL 37 29 libarchive 38 - libusb-compat-0_1 39 - qtbase 40 30 libpng 41 31 ]; 42 32 43 33 qmakeFlags = [ 44 34 "gui/qt" 45 - "CONFIG+=ltcg" 46 35 ]; 47 36 48 37 meta = with lib; { 49 - changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}"; 50 38 description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; 51 39 homepage = "https://ce-programming.github.io/CEmu"; 52 - license = licenses.gpl3; 40 + license = licenses.gpl3Plus; 53 41 maintainers = with maintainers; [ luc65r ]; 54 42 platforms = [ "x86_64-linux" "x86_64-darwin" ]; 55 43 broken = stdenv.isDarwin;
+1 -3
pkgs/top-level/all-packages.nix
··· 5212 5212 inherit (darwin.apple_sdk.frameworks) Carbon IOKit; 5213 5213 }; 5214 5214 5215 - cemu = qt5.callPackage ../applications/science/math/cemu { 5216 - stdenv = gcc9Stdenv; 5217 - }; 5215 + cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; 5218 5216 5219 5217 cider = callPackage ../applications/audio/cider { }; 5220 5218