mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
squirreldisk: add darwin support, reorder dependencies
This commit is contained in:
parent
4cc6bdd737
commit
6e0bcfca24
1 changed files with 43 additions and 29 deletions
|
@ -1,21 +1,25 @@
|
||||||
{
|
{
|
||||||
dbus,
|
|
||||||
openssl,
|
|
||||||
freetype,
|
|
||||||
libsoup_2_4,
|
|
||||||
gtk3,
|
|
||||||
webkitgtk_4_0,
|
|
||||||
pkg-config,
|
|
||||||
wrapGAppsHook3,
|
|
||||||
parallel-disk-usage,
|
|
||||||
fetchFromGitHub,
|
|
||||||
fetchNpmDeps,
|
|
||||||
npmHooks,
|
|
||||||
nodejs,
|
|
||||||
rustPlatform,
|
|
||||||
cargo-tauri_1,
|
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
rustPlatform,
|
||||||
|
|
||||||
|
fetchFromGitHub,
|
||||||
|
fetchNpmDeps,
|
||||||
|
|
||||||
|
cargo-tauri_1,
|
||||||
|
makeBinaryWrapper,
|
||||||
|
nodejs,
|
||||||
|
npmHooks,
|
||||||
|
pkg-config,
|
||||||
|
wrapGAppsHook3,
|
||||||
|
|
||||||
|
dbus,
|
||||||
|
freetype,
|
||||||
|
gtk3,
|
||||||
|
libsoup_2_4,
|
||||||
|
openssl,
|
||||||
|
parallel-disk-usage,
|
||||||
|
webkitgtk_4_0,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -53,20 +57,26 @@ rustPlatform.buildRustPackage rec {
|
||||||
cp ${parallel-disk-usage}/bin/pdu src-tauri/bin/pdu-${stdenv.hostPlatform.rust.rustcTarget}
|
cp ${parallel-disk-usage}/bin/pdu src-tauri/bin/pdu-${stdenv.hostPlatform.rust.rustcTarget}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
pkg-config
|
[
|
||||||
wrapGAppsHook3
|
cargo-tauri_1.hook
|
||||||
npmHooks.npmConfigHook
|
npmHooks.npmConfigHook
|
||||||
nodejs
|
nodejs
|
||||||
cargo-tauri_1.hook
|
]
|
||||||
];
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
|
pkg-config
|
||||||
|
wrapGAppsHook3
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
makeBinaryWrapper
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
dbus
|
dbus
|
||||||
openssl
|
|
||||||
freetype
|
freetype
|
||||||
libsoup_2_4
|
|
||||||
gtk3
|
gtk3
|
||||||
|
libsoup_2_4
|
||||||
|
openssl
|
||||||
webkitgtk_4_0
|
webkitgtk_4_0
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -77,10 +87,14 @@ rustPlatform.buildRustPackage rec {
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
# WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
|
# WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
|
||||||
postFixup = ''
|
postFixup =
|
||||||
wrapGApp "$out/bin/squirrel-disk" \
|
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||||
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
|
wrapGApp "$out/bin/squirrel-disk" \
|
||||||
'';
|
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
|
||||||
|
''
|
||||||
|
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
|
makeWrapper "$out/Applications/SquirrelDisk.app/Contents/MacOS/SquirrelDisk" "$out/bin/squirrel-disk"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Cross-platform disk usage analysis tool";
|
description = "Cross-platform disk usage analysis tool";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue