git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112520 from avdv/fix-spacefm-crash

spaceFM: Avoid segfault when running under Wayland

commit3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5 authorJörg Thalheim <Mic92@users.noreply.github.com> dateThu 11 Feb 2021, 10:27 (6 years ago) parent34e2c2b5937a4a
2 files changed+17−1
pkgs/applications/misc/spacefm/default.nix+7−1 pkgs/applications/misc/spacefm/x11-only.patch+10
pkgs/applications/misc/spacefm/default.nix+7−1
@@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
1313 sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
1414 };
1515
16− patches = [ ./glibc-fix.patch ];
16+ patches = [
17+ # fix compilation error due to missing include
18+ ./glibc-fix.patch
19+
20+ # restrict GDK backends to only X11
21+ ./x11-only.patch
22+ ];
1723
1824 configureFlags = [
1925 "--with-bash-path=${pkgs.bash}/bin/bash"
pkgs/applications/misc/spacefm/x11-only.patchnew file+10
@@ -0,0 +1,10 @@
1+--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100
2++++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100
3+@@ -1350,6 +1351,7 @@
4+ vfs_file_monitor_clean();
5+ return 1;
6+ }
7++ gdk_set_allowed_backends("x11");
8+ gtk_init (&argc, &argv);
9+ int ret = custom_dialog_init( argc, argv );
10+ if ( ret != 0 )