Merge pull request #112520 from avdv/fix-spacefm-crash

spaceFM: Avoid segfault when running under Wayland
This commit is contained in:
Jörg Thalheim 2021-02-11 10:27:50 +00:00 committed by GitHub
commit 3155a9e966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View File

@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
};
patches = [ ./glibc-fix.patch ];
patches = [
# fix compilation error due to missing include
./glibc-fix.patch
# restrict GDK backends to only X11
./x11-only.patch
];
configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash"

View File

@ -0,0 +1,10 @@
--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100
+++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100
@@ -1350,6 +1351,7 @@
vfs_file_monitor_clean();
return 1;
}
+ gdk_set_allowed_backends("x11");
gtk_init (&argc, &argv);
int ret = custom_dialog_init( argc, argv );
if ( ret != 0 )