Merge pull request #305611 from peeley/am2rlauncher-fix-gsettings-error

am2rlauncher: fix error with missing GSettings schemas
This commit is contained in:
tomberek 2024-04-27 01:59:47 -04:00 committed by GitHub
commit 9a17463275
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -17,6 +17,8 @@
, fetchFromGitHub , fetchFromGitHub
, buildFHSEnv , buildFHSEnv
, glib-networking , glib-networking
, wrapGAppsHook
, gsettings-desktop-schemas
}: }:
let let
am2r-run = buildFHSEnv { am2r-run = buildFHSEnv {
@ -69,7 +71,9 @@ buildDotnetModule {
openssl openssl
]; ];
buildInputs = [ gtk3 ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ];
patches = [ ./am2r-run-binary.patch ]; patches = [ ./am2r-run-binary.patch ];
@ -78,7 +82,6 @@ buildDotnetModule {
postFixup = '' postFixup = ''
wrapProgram $out/bin/AM2RLauncher.Gtk \ wrapProgram $out/bin/AM2RLauncher.Gtk \
--prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \
--prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules
mkdir -p $out/share/icons mkdir -p $out/share/icons
install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png