diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-02-11 10:27:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 10:27:50 +0000 |
| commit | 3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5 (patch) | |
| tree | ebe20a95d8ba05c6d0c661801560e350c600715a /pkgs | |
| parent | 34e2c2b310a4ede14a9c948b8407e4a9a459b051 (diff) | |
| parent | 5937a4aff8cd96cfceff9e98ee108595a26dc696 (diff) | |
| download | nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar.gz nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar.bz2 nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar.lz nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar.xz nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.tar.zst nixpkgs-3155a9e966ab674f8f228ae0d0f8b7f2de8a3bd5.zip | |
Merge pull request #112520 from avdv/fix-spacefm-crash
spaceFM: Avoid segfault when running under Wayland
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/spacefm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/spacefm/x11-only.patch | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index e08240733d1..3d9f7204875 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -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" diff --git a/pkgs/applications/misc/spacefm/x11-only.patch b/pkgs/applications/misc/spacefm/x11-only.patch new file mode 100644 index 00000000000..1b2f9f14582 --- /dev/null +++ b/pkgs/applications/misc/spacefm/x11-only.patch @@ -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 ) |