build: use libdbus over zenity
I completely misunderstood the RFD doc comments, thought that save file dialogs were not avaliable on linux outside of gtk this helps avoid the wrapper, which is nice; but I imagine it would fail if portals are unavaliable.
This commit is contained in:
parent
e98f268e59
commit
5a84b56025
1 changed files with 9 additions and 16 deletions
25
flake.nix
25
flake.nix
|
|
@ -20,6 +20,9 @@
|
||||||
name = cargoToml.package.name;
|
name = cargoToml.package.name;
|
||||||
|
|
||||||
dlDeps = with pkgs; [
|
dlDeps = with pkgs; [
|
||||||
|
# libdbus, for rfd
|
||||||
|
dbus
|
||||||
|
|
||||||
# needed for both x11 and wayland
|
# needed for both x11 and wayland
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
libGL
|
libGL
|
||||||
|
|
@ -77,19 +80,13 @@
|
||||||
// {
|
// {
|
||||||
inherit cargoArtifacts;
|
inherit cargoArtifacts;
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = commonArgs.nativeBuildInputs ++ [
|
||||||
commonArgs.nativeBuildInputs
|
pkgs.autoPatchelfHook
|
||||||
++ [
|
];
|
||||||
pkgs.autoPatchelfHook
|
|
||||||
]
|
|
||||||
++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.makeBinaryWrapper;
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = commonArgs.buildInputs ++ [
|
||||||
commonArgs.buildInputs
|
pkgs.libgcc
|
||||||
++ [
|
];
|
||||||
pkgs.libgcc
|
|
||||||
]
|
|
||||||
++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.zenity;
|
|
||||||
|
|
||||||
runtimeDependencies = dlDeps;
|
runtimeDependencies = dlDeps;
|
||||||
|
|
||||||
|
|
@ -98,10 +95,6 @@
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
mkdir -p "$out/share/applications"
|
mkdir -p "$out/share/applications"
|
||||||
ln -s "${desktopItem}"/share/applications/* "$out/share/applications/"
|
ln -s "${desktopItem}"/share/applications/* "$out/share/applications/"
|
||||||
''
|
|
||||||
+ lib.optionalString pkgs.stdenv.hostPlatform.isLinux /* sh */ ''
|
|
||||||
wrapProgram $out/bin/${name} \
|
|
||||||
--prefix PATH : ${lib.makeBinPath [ pkgs.zenity ]}
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue