push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
diff --git a/src/main.c b/src/main.c
index 27f5614..2b45708 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <sys/sysmacros.h>
#include <signal.h>

View File

@@ -0,0 +1,104 @@
{
pkgs,
fetchFromGitHub,
fetchpatch,
lib,
stdenv,
gtk3,
udev,
desktop-file-utils,
shared-mime-info,
intltool,
pkg-config,
wrapGAppsHook3,
ffmpegthumbnailer,
jmtpfs,
ifuseSupport ? false,
ifuse ? null,
lsof,
udisks2,
}:
stdenv.mkDerivation rec {
pname = "spacefm";
version = "1.0.6";
src = fetchFromGitHub {
owner = "IgnorantGuru";
repo = "spacefm";
rev = version;
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
};
patches = [
# fix compilation error due to missing include
./glibc-fix.patch
# restrict GDK backends to only X11
./x11-only.patch
# gcc-14 build fix from:
# https://github.com/IgnorantGuru/spacefm/pull/816
(fetchpatch {
name = "gcc-14.patch";
url = "https://github.com/IgnorantGuru/spacefm/commit/98efb1f43e6339b3ceddb9f65ee85e26790fefdf.patch";
hash = "sha256-dau1AMnSBsp8iDrjoo0WTnFQ13vNZW2kM4qz0B/beDI=";
})
];
# Workaround build failure on -fno-common toolchains:
# ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of
# `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here
# TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772
# or equivalent is merged upstream.
env.NIX_CFLAGS_COMPILE = "-fcommon";
configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash"
"--sysconfdir=${placeholder "out"}/etc"
];
postInstall = ''
rm -f $out/etc/spacefm/spacefm.conf
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
'';
preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
nativeBuildInputs = [
pkg-config
intltool
];
buildInputs = [
gtk3
udev
desktop-file-utils
shared-mime-info
wrapGAppsHook3
ffmpegthumbnailer
jmtpfs
lsof
udisks2
]
++ (lib.optionals ifuseSupport [ ifuse ]);
# Introduced because ifuse doesn't build due to CVEs in libplist
# Revert when libplist builds again…
meta = with lib; {
description = "Multi-panel tabbed file manager";
longDescription = ''
Multi-panel tabbed file and desktop manager for Linux
with built-in VFS, udev- or HAL-based device manager,
customizable menu system, and bash integration
'';
homepage = "http://ignorantguru.github.io/spacefm/";
platforms = platforms.linux;
license = licenses.gpl3Plus;
maintainers = with maintainers; [
jagajaga
obadz
];
};
}

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 )