BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31996 from kierdavis/ckb-next

Browse source 
ckb: update to ckb-next 0.2.8
This commit is contained in:
Graham Christensen 2017-11-24 08:42:57 -05:00 committed by GitHub
commit 3216947201
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/ckb/ckb-animations-location.patch
View file

@ -1,12 +1,12 @@
diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp
index d0b7f46..d7a3459 100644 index f49a64c..d7a3459 100644
--- a/src/ckb/animscript.cpp --- a/src/ckb/animscript.cpp
+++ b/src/ckb/animscript.cpp +++ b/src/ckb/animscript.cpp
@@ -30,7 +30,7 @@ QString AnimScript::path(){ @@ -30,7 +30,7 @@ QString AnimScript::path(){
#ifdef __APPLE__ #ifdef __APPLE__
return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations"); return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations");
#else #else
- return QDir(QApplication::applicationDirPath()).absoluteFilePath("ckb-animations"); - return QDir("/usr/lib").absoluteFilePath("ckb-animations");
+ return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations"); + return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations");
#endif #endif
} }

12
pkgs/tools/misc/ckb/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }: { stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.6"; version = "0.2.8";
name = "ckb-${version}"; name = "ckb-next-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ccMSC"; owner = "mattanger";
repo = "ckb"; repo = "ckb-next";
rev = "v${version}"; rev = "v${version}";
sha256 = "04h50qdzsbi77mj62jghr52i35vxvmhnvsb7pdfdq95ryry8bnwm"; sha256 = "0b3h1d54mdyfcx46zvsd7dfqf2656h4jjkiw044170gnfdzxjb3w";
}; };
buildInputs = [ buildInputs = [
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Driver and configuration tool for Corsair keyboards and mice"; description = "Driver and configuration tool for Corsair keyboards and mice";
homepage = https://github.com/ccMSC/ckb; homepage = https://github.com/mattanger/ckb-next;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ kierdavis ]; maintainers = with maintainers; [ kierdavis ];