From 99ea11ac5ef62994a33616927d651c7a3b26f918 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 10 Jun 2022 21:37:49 +0200
Subject: ma: fix 22.05 evaluation errors

---
 makefu/5pkgs/chitubox/default.nix                 | 4 ++--
 makefu/5pkgs/ns-atmosphere-programmer/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
index d0596e70..afec1144 100644
--- a/makefu/5pkgs/chitubox/default.nix
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -2,7 +2,7 @@
 , libgcrypt,zlib,glib,fontconfig,freetype,libdrm
 , libxkbcommon
 , libpulseaudio
-, xlibs
+, xorg
 , gst_all_1
 , krb5
 , alsaLib
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm 
+  buildInputs = with xorg; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm 
   libxkbcommon libpulseaudio alsaLib
   xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
   gst_all_1.gst-plugins-base gst_all_1.gstreamer krb5
diff --git a/makefu/5pkgs/ns-atmosphere-programmer/default.nix b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
index c17e0ac7..aa7af992 100644
--- a/makefu/5pkgs/ns-atmosphere-programmer/default.nix
+++ b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, lib
 , makeWrapper
 , autoPatchelfHook
-, xlibs
+, xorg
 , gnome3
 , libpng12
 }:
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "1cnyydsmrcpfwpdiry7qybh179499wpbvlzq5rk442hq9ak416ri";
   };
 
-  buildInputs = with xlibs; [ libX11 libXxf86vm libSM gnome3.gtk libpng12 ];
+  buildInputs = with xorg; [ libX11 libXxf86vm libSM gnome3.gtk libpng12 ];
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
   installPhase = ''
     install -D -m755 NS-Atmosphere $out/bin/NS-Atmosphere
     wrapProgram $out/bin/NS-Atmosphere --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
---suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+--suffix XDG_DATA_DIRS : '${pkgs.gnome.adwaita-icon-theme}/share'
   '';
 
   dontStrip = true;
-- 
cgit v1.2.3