From c3adb252afa29f0140f29c935201cfbb100b5697 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Apr 2022 19:49:07 +0200
Subject: ma pkgs.ns-usbloader: use wrapGappsHook

---
 makefu/1systems/x/config.nix          | 3 ++-
 makefu/5pkgs/ns-usbloader/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 3edfcecc1..4f5fe44b5 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -13,7 +13,7 @@
       # ./x230
 
       # Common Hardware Components
-
+      <nix-ld/modules/nix-ld.nix>
       # <stockholm/makefu/2configs/hw/mceusb.nix>
       # <stockholm/makefu/2configs/hw/rtl8812au.nix>
       <stockholm/makefu/2configs/hw/network-manager.nix>
@@ -26,6 +26,7 @@
       <stockholm/makefu/2configs/hw/droidcam.nix>
       <stockholm/makefu/2configs/hw/smartcard.nix>
       <stockholm/makefu/2configs/hw/upower.nix>
+      <stockholm/makefu/2configs/hw/nswitch.nix>
       #<stockholm/makefu/2configs/hw/ps4-compat.nix>
 
       # base
diff --git a/makefu/5pkgs/ns-usbloader/default.nix b/makefu/5pkgs/ns-usbloader/default.nix
index 42e12e38e..b3890d11b 100644
--- a/makefu/5pkgs/ns-usbloader/default.nix
+++ b/makefu/5pkgs/ns-usbloader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook, glib , jre }:
 
 stdenv.mkDerivation rec {
   name = "ns-usbloader-${version}";
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
   };
 
 
-  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
 
   dontUnpack = true;
@@ -22,6 +21,7 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/ns-usbloader/ns-usbloader.jar"
     runHook postInstall
   '';
+  nativeBuildInputs = [ glib wrapGAppsHook makeWrapper ];
 
 
   meta = with lib; {
-- 
cgit v1.2.3