Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma pkgs.ns-usbloader: use wrapGappsHook

Browse Source
This commit is contained in:
makefu 2022-04-08 19:49:07 +02:00
parent 4156d2ed15
commit c3adb252af
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefu/1systems/x/config.nix
View File

@ -13,7 +13,7 @@
# ./x230 # ./x230
# Common Hardware Components # Common Hardware Components
<nix-ld/modules/nix-ld.nix>
# <stockholm/makefu/2configs/hw/mceusb.nix> # <stockholm/makefu/2configs/hw/mceusb.nix>
# <stockholm/makefu/2configs/hw/rtl8812au.nix> # <stockholm/makefu/2configs/hw/rtl8812au.nix>
<stockholm/makefu/2configs/hw/network-manager.nix> <stockholm/makefu/2configs/hw/network-manager.nix>
@ -26,6 +26,7 @@
<stockholm/makefu/2configs/hw/droidcam.nix> <stockholm/makefu/2configs/hw/droidcam.nix>
<stockholm/makefu/2configs/hw/smartcard.nix> <stockholm/makefu/2configs/hw/smartcard.nix>
<stockholm/makefu/2configs/hw/upower.nix> <stockholm/makefu/2configs/hw/upower.nix>
<stockholm/makefu/2configs/hw/nswitch.nix>
#<stockholm/makefu/2configs/hw/ps4-compat.nix> #<stockholm/makefu/2configs/hw/ps4-compat.nix>
# base # base

4
makefu/5pkgs/ns-usbloader/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }: { lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook, glib , jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ns-usbloader-${version}"; name = "ns-usbloader-${version}";
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ]; buildInputs = [ jre ];
dontUnpack = true; dontUnpack = true;
@ -22,6 +21,7 @@ stdenv.mkDerivation rec {
--add-flags "-jar $out/ns-usbloader/ns-usbloader.jar" --add-flags "-jar $out/ns-usbloader/ns-usbloader.jar"
runHook postInstall runHook postInstall
''; '';
nativeBuildInputs = [ glib wrapGAppsHook makeWrapper ];
meta = with lib; { meta = with lib; {