Merge pull request #250358 from panda2134/master

openrgb: 0.8 -> 0.9
This commit is contained in:
Francesco Gazzetta 2023-08-23 12:53:53 +02:00 committed by GitHub
commit 799e2353c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 29 deletions

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, qtbase
, openrgb
, glib
@ -13,24 +12,16 @@
stdenv.mkDerivation rec {
pname = "openrgb-plugin-effects";
version = "0.8";
version = "0.9";
src = fetchFromGitLab {
owner = "OpenRGBDevelopers";
repo = "OpenRGBEffectsPlugin";
rev = "release_${version}";
hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg=";
hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog=";
fetchSubmodules = true;
};
patches = [
# Add install rule
(fetchpatch {
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch";
hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E=";
})
];
postPatch = ''
# Use the source of openrgb from nixpkgs instead of the submodule
rm -r OpenRGB

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, qtbase
, openrgb
, glib
@ -14,28 +13,15 @@
stdenv.mkDerivation rec {
pname = "openrgb-plugin-hardwaresync";
version = "0.8";
version = "0.9";
src = fetchFromGitLab {
owner = "OpenRGBDevelopers";
repo = "OpenRGBHardwareSyncPlugin";
rev = "release_${version}";
hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo=";
hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0=";
};
patches = [
(fetchpatch {
name = "use-pkgconfig";
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch";
hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw=";
})
(fetchpatch {
name = "add-install-rule";
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch";
hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY=";
})
];
postPatch = ''
# Use the source of openrgb from nixpkgs instead of the submodule
rmdir OpenRGB

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openrgb";
version = "0.8";
version = "0.9";
src = fetchFromGitLab {
owner = "CalcProgrammer1";
repo = "OpenRGB";
rev = "release_${version}";
sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s=";
sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
};
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];