reya/lume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: build on linux

Browse Source
This commit is contained in:
reya
2024-07-31 12:51:17 +07:00
parent a55b31b0e6
commit 954a17b541
5 changed files with 129 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View File

@@ -18,10 +18,10 @@ jobs:
args: "--target x86_64-apple-darwin" args: "--target x86_64-apple-darwin"
- platform: "macos-latest" # for Intel based macs. - platform: "macos-latest" # for Intel based macs.
args: "--target universal-apple-darwin" args: "--target universal-apple-darwin"
#- platform: 'ubuntu-22.04' - platform: 'ubuntu-22.04'
# args: '' args: ''
#- platform: 'windows-latest' - platform: 'windows-latest'
# args: '--target x86_64-pc-windows-msvc' args: '--target x86_64-pc-windows-msvc'
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

5
src-tauri/src/commands/window.rs
View File

@@ -198,7 +198,7 @@ pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), S
&window.label, &window.label,
WebviewUrl::App(PathBuf::from(window.url)), WebviewUrl::App(PathBuf::from(window.url)),
) )
.title(title) .title(&window.title)
.min_inner_size(window.width, window.height) .min_inner_size(window.width, window.height)
.inner_size(window.width, window.height) .inner_size(window.width, window.height)
.minimizable(window.minimizable) .minimizable(window.minimizable)
@@ -218,7 +218,7 @@ pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), S
&window.label, &window.label,
WebviewUrl::App(PathBuf::from(window.url)), WebviewUrl::App(PathBuf::from(window.url)),
) )
.title(title) .title(&window.title)
.min_inner_size(window.width, window.height) .min_inner_size(window.width, window.height)
.inner_size(window.width, window.height) .inner_size(window.width, window.height)
.minimizable(window.minimizable) .minimizable(window.minimizable)
@@ -227,6 +227,7 @@ pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), S
.unwrap(); .unwrap();
// Set decoration // Set decoration
#[cfg(not(target_os = "linux"))]
window.create_overlay_titlebar().unwrap(); window.create_overlay_titlebar().unwrap();
// Restore native border // Restore native border

10
src-tauri/src/main.rs
View File

@@ -140,7 +140,13 @@ fn main() {
builder.build().unwrap() builder.build().unwrap()
}; };
tauri::Builder::default() #[cfg(target_os = "macos")]
let builder = tauri::Builder::default().plugin(tauri_nspanel::init());
#[cfg(not(target_os = "macos"))]
let builder = tauri::Builder::default();
builder
.setup(|app| { .setup(|app| {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
app.handle().plugin(tauri_nspanel::init()).unwrap(); app.handle().plugin(tauri_nspanel::init()).unwrap();
@@ -239,8 +245,6 @@ fn main() {
Ok(()) Ok(())
}) })
.enable_macos_default_menu(false)
.plugin(tauri_nspanel::init())
.plugin(tauri_plugin_theme::init(ctx.config_mut())) .plugin(tauri_plugin_theme::init(ctx.config_mut()))
.plugin(tauri_plugin_decorum::init()) .plugin(tauri_plugin_decorum::init())
.plugin(tauri_plugin_clipboard_manager::init()) .plugin(tauri_plugin_clipboard_manager::init())

1
src-tauri/src/nostr/keys.rs
View File

@@ -1,3 +1,4 @@
#[cfg(target_os = "macos")]
use crate::commands::tray::create_tray_panel; use crate::commands::tray::create_tray_panel;
use crate::nostr::event::RichEvent; use crate::nostr::event::RichEvent;
use crate::nostr::internal::{get_user_settings, init_nip65}; use crate::nostr::internal::{get_user_settings, init_nip65};

243
src-tauri/tauri.conf.json
View File

@@ -1,131 +1,116 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/schema.json", "$schema": "../node_modules/@tauri-apps/cli/schema.json",
"productName": "Lume", "productName": "Lume",
"version": "4.0.14", "version": "4.0.14",
"identifier": "nu.lume.Lume", "identifier": "nu.lume.Lume",
"build": { "build": {
"beforeBuildCommand": "pnpm desktop:build", "beforeBuildCommand": "pnpm desktop:build",
"beforeDevCommand": "pnpm desktop:dev", "beforeDevCommand": "pnpm desktop:dev",
"devUrl": "http://localhost:3000", "devUrl": "http://localhost:3000",
"frontendDist": "../dist" "frontendDist": "../dist"
}, },
"app": { "app": {
"macOSPrivateApi": true, "macOSPrivateApi": true,
"withGlobalTauri": true, "withGlobalTauri": true,
"security": { "security": {
"assetProtocol": { "assetProtocol": {
"enable": true, "enable": true,
"scope": [ "scope": [
"$APPDATA/*", "$APPDATA/*",
"$DATA/*", "$DATA/*",
"$LOCALDATA/*", "$LOCALDATA/*",
"$DESKTOP/*", "$DESKTOP/*",
"$DOCUMENT/*", "$DOCUMENT/*",
"$DOWNLOAD/*", "$DOWNLOAD/*",
"$HOME/*", "$HOME/*",
"$PICTURE/*", "$PICTURE/*",
"$PUBLIC/*", "$PUBLIC/*",
"$VIDEO/*", "$VIDEO/*",
"$APPCONFIG/*", "$APPCONFIG/*",
"$RESOURCE/*" "$RESOURCE/*"
] ]
} }
} }
}, },
"bundle": { "bundle": {
"licenseFile": "../LICENSE", "licenseFile": "../LICENSE",
"homepage": "https://lume.nu", "homepage": "https://lume.nu",
"longDescription": "nostr client for desktop", "longDescription": "nostr client for desktop",
"shortDescription": "nostr client", "shortDescription": "nostr client",
"targets": "all", "targets": "all",
"active": true, "active": true,
"category": "SocialNetworking", "category": "SocialNetworking",
"resources": [ "resources": [
"resources/*", "resources/*",
"locales/*" "locales/*"
], ],
"icon": [ "icon": [
"icons/32x32.png", "icons/32x32.png",
"icons/128x128.png", "icons/128x128.png",
"icons/128x128@2x.png", "icons/128x128@2x.png",
"icons/icon.icns", "icons/icon.icns",
"icons/icon.ico" "icons/icon.ico"
], ],
"linux": { "linux": {
"appimage": { "appimage": {
"bundleMediaFramework": true, "bundleMediaFramework": true,
"files": {} "files": {}
}, },
"deb": { "deb": {
"files": {} "files": {}
}, },
"rpm": { "rpm": {
"epoch": 0, "epoch": 0,
"files": {}, "files": {},
"release": "1" "release": "1"
} }
}, },
"macOS": { "macOS": {
"dmg": { "minimumSystemVersion": "10.15"
"appPosition": { },
"x": 180, "windows": {
"y": 170 "allowDowngrades": true,
}, "certificateThumbprint": null,
"applicationFolderPosition": { "digestAlgorithm": "sha256",
"x": 480, "nsis": null,
"y": 170 "timestampUrl": null,
}, "tsp": false,
"windowSize": { "webviewFixedRuntimePath": null,
"height": 400, "webviewInstallMode": {
"width": 660 "silent": true,
} "type": "downloadBootstrapper"
}, },
"files": {}, "wix": null
"minimumSystemVersion": "10.15" },
}, "fileAssociations": [
"windows": { {
"allowDowngrades": true, "name": "bech32",
"certificateThumbprint": null, "description": "Nostr BECH32",
"digestAlgorithm": "sha256", "ext": [
"nsis": null, "npub",
"timestampUrl": null, "nsec",
"tsp": false, "nprofile",
"webviewFixedRuntimePath": null, "nevent",
"webviewInstallMode": { "naddr",
"silent": true, "nrelay"
"type": "downloadBootstrapper" ],
}, "role": "Viewer"
"wix": null }
}, ],
"fileAssociations": [ "createUpdaterArtifacts": true
{ },
"name": "bech32", "plugins": {
"description": "Nostr BECH32", "updater": {
"ext": [ "active": true,
"npub", "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
"nsec", "windows": {
"nprofile", "installMode": "quiet"
"nevent", },
"naddr", "endpoints": [
"nrelay" "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
], "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}",
"role": "Viewer" "https://github.com/lumehq/lume/releases/latest/download/latest.json"
} ]
], }
"createUpdaterArtifacts": true }
},
"plugins": {
"updater": {
"active": true,
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
"windows": {
"installMode": "quiet"
},
"endpoints": [
"https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
"https://lus.reya3772.workers.dev/{{target}}/{{current_version}}",
"https://github.com/lumehq/lume/releases/latest/download/latest.json"
]
}
}
} }