diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:25:23 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:25:23 +0000 |
commit | 2a87a287685e127797106ffe684015a2371729fd (patch) | |
tree | 86f3180cc4eea397d9741a530593682404e94627 /nixpkgs/pkgs/data | |
parent | 53533fd13b70e6e78e9a63c7dad027b116335a2d (diff) | |
parent | 83b8726e5f6f85a28405c7772f75093fd9a399a3 (diff) | |
download | nixlib-2a87a287685e127797106ffe684015a2371729fd.tar nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.gz nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.bz2 nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.lz nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.xz nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.zst nixlib-2a87a287685e127797106ffe684015a2371729fd.zip |
Merge commit '83b8726e5f6f85a28405c7772f75093fd9a399a3'
Diffstat (limited to 'nixpkgs/pkgs/data')
-rw-r--r--[-rwxr-xr-x] | nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix | 0 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/themes/nordic/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/themes/orchis-theme/default.nix | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix index d65b270c881f..d65b270c881f 100755..100644 --- a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix index 8d977671fe7d..c8e956c3f83d 100644 --- a/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , gtk-engine-murrine , jdupes +, libsForQt5 }: stdenv.mkDerivation rec { @@ -79,6 +80,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdupes ]; + buildInputs = with libsForQt5; [ + plasma-framework + qtgraphicaleffects + plasma-workspace + breeze-icons + ]; + + dontWrapQtApps = true; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' diff --git a/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index 2d07ac3ae380..351c1c22207c 100644 --- a/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-05-27"; + version = "2023-10-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; + hash = "sha256-GhSzTtbuvbAuXxKNm29sJX5kXE2s2jMDB6Ww6Q7GNSo="; }; nativeBuildInputs = [ gtk3 sassc ]; |