Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #31996 from kierdavis/ckb-next

ckb: update to ckb-next 0.2.8

authored by Graham Christensen and committed by GitHub 32169472 10b113f8

+8 -8
+2 -2
pkgs/tools/misc/ckb/ckb-animations-location.patch
··· 1 1 diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp 2 - index d0b7f46..d7a3459 100644 2 + index f49a64c..d7a3459 100644 3 3 --- a/src/ckb/animscript.cpp 4 4 +++ b/src/ckb/animscript.cpp 5 5 @@ -30,7 +30,7 @@ QString AnimScript::path(){ 6 6 #ifdef __APPLE__ 7 7 return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations"); 8 8 #else 9 - - return QDir(QApplication::applicationDirPath()).absoluteFilePath("ckb-animations"); 9 + - return QDir("/usr/lib").absoluteFilePath("ckb-animations"); 10 10 + return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations"); 11 11 #endif 12 12 }
+6 -6
pkgs/tools/misc/ckb/default.nix
··· 1 1 { stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "0.2.6"; 5 - name = "ckb-${version}"; 4 + version = "0.2.8"; 5 + name = "ckb-next-${version}"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "ccMSC"; 9 - repo = "ckb"; 8 + owner = "mattanger"; 9 + repo = "ckb-next"; 10 10 rev = "v${version}"; 11 - sha256 = "04h50qdzsbi77mj62jghr52i35vxvmhnvsb7pdfdq95ryry8bnwm"; 11 + sha256 = "0b3h1d54mdyfcx46zvsd7dfqf2656h4jjkiw044170gnfdzxjb3w"; 12 12 }; 13 13 14 14 buildInputs = [ ··· 39 39 40 40 meta = with stdenv.lib; { 41 41 description = "Driver and configuration tool for Corsair keyboards and mice"; 42 - homepage = https://github.com/ccMSC/ckb; 42 + homepage = https://github.com/mattanger/ckb-next; 43 43 license = licenses.gpl2; 44 44 platforms = platforms.linux; 45 45 maintainers = with maintainers; [ kierdavis ];