diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-01 13:21:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 13:21:17 +0100 |
commit | 37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e (patch) | |
tree | 376eed9488c24af8bb3388b16f9b88d5b2e0c74e | |
parent | 9ce91be010e177d946994319f237685ca066dc3d (diff) | |
parent | b5a0c7466c286b852436d6aaed5826a639212641 (diff) | |
download | nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar.gz nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar.bz2 nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar.lz nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar.xz nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.tar.zst nixlib-37c9f30f660fa78228bf1fef1e1d7a1af7a80c3e.zip |
Merge pull request #107983 from Emantor/topic/chiaki_bump_touchpad
chiaki: 1.3.0 -> 2.0.1 & touchpad support
-rw-r--r-- | pkgs/games/chiaki/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 27dde97ead7b..63afec7264ce 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,23 +1,25 @@ -{ lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf -, python3Packages, SDL2 }: +{ lib, mkDerivation, fetchgit +, cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmacextras, qtmultimedia +, qtsvg , pkg-config, protobuf , python3Packages, SDL2, stdenv }: +with stdenv.lib; mkDerivation rec { pname = "chiaki"; - version = "1.3.0"; + version = "2.0.1"; - src = fetchFromGitHub { + src = fetchgit { + url = "https://git.sr.ht/~thestr4ng3r/chiaki"; rev = "v${version}"; - owner = "thestr4ng3r"; - repo = "chiaki"; fetchSubmodules = true; - sha256 = "07w7srxxr8zjp91p5n1sqf4j8lljfrm78lz1m15s2nzlm579015h"; + sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892"; }; nativeBuildInputs = [ - cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf + cmake pkg-config protobuf python3Packages.python python3Packages.protobuf ]; - buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ] + ++ optionals stdenv.hostPlatform.isLinux [ libevdev udev] + ++ optionals (stdenv.isDarwin) [ qtmacextras ]; doCheck = true; installCheckPhase = "$out/bin/chiaki --help"; |