From f94b0f1370d4633cba8397642e809bc39d4461f8 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 7 May 2025 15:42:25 -0400 Subject: Add some gentoo host files --- files/nixpkgs-patches/399384.diff | 21 --------------- files/nixpkgs-patches/399388.diff | 43 +++++++++++++++++++++++------- files/nixpkgs-patches/adw-gtk3-patch.diff | 13 +++++++++ files/nixpkgs-patches/adw-gtk3-update.diff | 40 +++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 30 deletions(-) delete mode 100644 files/nixpkgs-patches/399384.diff create mode 100644 files/nixpkgs-patches/adw-gtk3-patch.diff create mode 100644 files/nixpkgs-patches/adw-gtk3-update.diff (limited to 'files') diff --git a/files/nixpkgs-patches/399384.diff b/files/nixpkgs-patches/399384.diff deleted file mode 100644 index f5737f5..0000000 --- a/files/nixpkgs-patches/399384.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index 496f74440aad98..91624d6d4bfc03 100644 ---- a/pkgs/development/libraries/mesa/common.nix -+++ b/pkgs/development/libraries/mesa/common.nix -@@ -5,14 +5,14 @@ - # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa - rec { - pname = "mesa"; -- version = "25.0.3"; -+ version = "25.0.4"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-OM/T6pkq4vgEYZ7TlLRVsyMknLxQC9L+iOPF20ToZi8="; -+ hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU="; - }; - - meta = { diff --git a/files/nixpkgs-patches/399388.diff b/files/nixpkgs-patches/399388.diff index 41f6ebe..4815efe 100644 --- a/files/nixpkgs-patches/399388.diff +++ b/files/nixpkgs-patches/399388.diff @@ -1,29 +1,37 @@ diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index 91624d6d4bfc03..0332e1a5b22bb6 100644 +index adfbe426cc00de..471080fd75a071 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; -- version = "25.0.4"; -+ version = "25.1.0-rc1"; +- version = "25.0.5"; ++ version = "25.1.0-rc3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; -- hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU="; -+ hash = "sha256-vQrTGGhIfy41uaCQ4rg+ZlCp43qI1wMK6QIrGKr4+Ts="; +- hash = "sha256-zYZgvuRnqhPbVmxmdmq4rLng20gMiAvJYD0o4jN5McI="; ++ hash = "sha256-X1T4dqQSHhnoRXXjjyWrRu4u8RJ5h+PFBQYf/gUInm4="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix -index 255cda5a742372..4994c83e680676 100644 +index f691f2d3bf8cbb..00a4d7964ed27e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix -@@ -103,8 +103,10 @@ +@@ -16,6 +16,7 @@ + libdrm, + libgbm, + libglvnd, ++ libpng, + libunwind, + libva-minimal, + libvdpau, +@@ -103,8 +104,10 @@ ], vulkanLayers ? [ "device-select" @@ -35,7 +43,7 @@ index 255cda5a742372..4994c83e680676 100644 ], mesa, mesa-gl-headers, -@@ -161,7 +163,6 @@ stdenv.mkDerivation { +@@ -161,7 +164,6 @@ stdenv.mkDerivation { patches = [ ./opencl.patch @@ -43,7 +51,7 @@ index 255cda5a742372..4994c83e680676 100644 ]; postPatch = '' -@@ -223,7 +224,6 @@ stdenv.mkDerivation { +@@ -223,7 +225,6 @@ stdenv.mkDerivation { (lib.mesonBool "libgbm-external" true) (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK @@ -51,6 +59,23 @@ index 255cda5a742372..4994c83e680676 100644 # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, # so we're keeping it for now. Should be removed when that's no longer the case. +@@ -277,6 +278,7 @@ stdenv.mkDerivation { + libdrm + libgbm + libglvnd ++ libpng + libunwind + libva-minimal + libvdpau +@@ -350,7 +352,7 @@ stdenv.mkDerivation { + postInstall = '' + moveToOutput bin/intel_clc $cross_tools + moveToOutput bin/mesa_clc $cross_tools +- moveToOutput bin/vtn_bindgen $cross_tools ++ moveToOutput bin/vtn_bindgen2 $cross_tools + + moveToOutput "lib/lib*OpenCL*" $opencl + # Construct our own .icd file that contains an absolute path. diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch index 8444237d3d5418..9d40da82f85649 100644 --- a/pkgs/development/libraries/mesa/opencl.patch diff --git a/files/nixpkgs-patches/adw-gtk3-patch.diff b/files/nixpkgs-patches/adw-gtk3-patch.diff new file mode 100644 index 0000000..90ab11c --- /dev/null +++ b/files/nixpkgs-patches/adw-gtk3-patch.diff @@ -0,0 +1,13 @@ +diff --git a/src/sass/gtk4/libadwaita-tweaks.scss b/src/sass/gtk4/libadwaita-tweaks.scss +index 8750a89..fe9308e 100644 +--- a/src/sass/gtk4/libadwaita-tweaks.scss ++++ b/src/sass/gtk4/libadwaita-tweaks.scss +@@ -19,7 +19,7 @@ + --accent-purple: #9141ac; + --accent-slate: #6f8396; + +- --accent-bg-color: var(--accent-blue); ++ --accent-bg-color: @accent_bg_color; + --accent-fg-color: @accent_fg_color; + + --window-bg-color: @window_bg_color; diff --git a/files/nixpkgs-patches/adw-gtk3-update.diff b/files/nixpkgs-patches/adw-gtk3-update.diff new file mode 100644 index 0000000..0ea2bd0 --- /dev/null +++ b/files/nixpkgs-patches/adw-gtk3-update.diff @@ -0,0 +1,40 @@ +diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix +index 7511b9524..6cb3054cd 100644 +--- a/pkgs/by-name/ad/adw-gtk3/package.nix ++++ b/pkgs/by-name/ad/adw-gtk3/package.nix +@@ -5,29 +5,29 @@ + nix-update-script, + meson, + ninja, +- sassc, ++ dart-sass, + }: + + stdenvNoCC.mkDerivation (finalAttrs: { + pname = "adw-gtk3"; +- version = "5.10"; ++ version = "6.1"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = "adw-gtk3"; + tag = "v${finalAttrs.version}"; +- hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10="; ++ hash = "sha256-fY5z7KQXygGhkai1N3iMsnC1ZFjIAoBndjsPcv58kXg="; + }; + + nativeBuildInputs = [ + meson + ninja +- sassc ++ dart-sass + ]; + + postPatch = '' +- chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh +- patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh ++ chmod +x scripts/render-assets.sh ++ patchShebangs +x scripts/render-assets.sh + ''; + + passthru = { -- cgit v1.2.3-101-g0448