Merge pull request #300723 from A1ca7raz/nixos-unstable

sierra-breeze-enhanced: 1.3.3 -> 2.0.1
This commit is contained in:
Peder Bergebakken Sundt 2024-04-03 01:54:23 +02:00 committed by GitHub
commit ce93557538
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 4 deletions

View file

@ -256,6 +256,12 @@
githubId = 381298; githubId = 381298;
name = "9R"; name = "9R";
}; };
A1ca7raz = {
email = "aya@wtm.moe";
github = "A1ca7raz";
githubId = 7345998;
name = "A1ca7raz";
};
a1russell = { a1russell = {
email = "adamlr6+pub@gmail.com"; email = "adamlr6+pub@gmail.com";
github = "a1russell"; github = "a1russell";

View file

@ -5,17 +5,24 @@
, wrapQtAppsHook , wrapQtAppsHook
, kwin , kwin
, lib , lib
, useQt5 ? false
}: }:
let
latestVersion = "2.0.1";
latestSha256 = "sha256-4KvOhQSYmHV/5TxyeK4f1uUmHK5uR5xXC2MfPTM96SM=";
qt5Version = "1.3.3";
qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc=";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sierra-breeze-enhanced"; pname = "sierra-breeze-enhanced";
version = "1.3.3"; version = if useQt5 then qt5Version else latestVersion;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kupiqu"; owner = "kupiqu";
repo = "SierraBreezeEnhanced"; repo = "SierraBreezeEnhanced";
rev = "V${version}"; rev = "V${version}";
sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; sha256 = if useQt5 then qt5Sha256 else latestSha256;
}; };
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
@ -32,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/kupiqu/SierraBreezeEnhanced"; homepage = "https://github.com/kupiqu/SierraBreezeEnhanced";
changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}"; changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ A1ca7raz ];
}; };
} }

View file

@ -29399,7 +29399,7 @@ with pkgs;
shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; };
simp1e-cursors = callPackage ../data/icons/simp1e-cursors { }; simp1e-cursors = callPackage ../data/icons/simp1e-cursors { };

View file

@ -271,6 +271,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
rlottie-qml = callPackage ../development/libraries/rlottie-qml { }; rlottie-qml = callPackage ../development/libraries/rlottie-qml { };
sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; };
soqt = callPackage ../development/libraries/soqt { }; soqt = callPackage ../development/libraries/soqt { };
telepathy = callPackage ../development/libraries/telepathy/qt { }; telepathy = callPackage ../development/libraries/telepathy/qt { };

View file

@ -105,6 +105,8 @@ makeScopeWithSplicing' {
# is, to allow users to choose the right build if needed. # is, to allow users to choose the right build if needed.
sddm = callPackage ../applications/display-managers/sddm {}; sddm = callPackage ../applications/display-managers/sddm {};
sierra-breeze-enhanced = kdePackages.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { };
signond = callPackage ../development/libraries/signond {}; signond = callPackage ../development/libraries/signond {};
waylib = callPackage ../development/libraries/waylib { }; waylib = callPackage ../development/libraries/waylib { };