diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/applications/editors/lapce/default.nix | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/lapce/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/lapce/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/editors/lapce/default.nix b/nixpkgs/pkgs/applications/editors/lapce/default.nix index 01ae7308ee06..6b955bdb180b 100644 --- a/nixpkgs/pkgs/applications/editors/lapce/default.nix +++ b/nixpkgs/pkgs/applications/editors/lapce/default.nix @@ -7,8 +7,6 @@ , pkg-config , perl , fontconfig -, copyDesktopItems -, makeDesktopItem , glib , gtk3 , openssl @@ -84,11 +82,14 @@ rustPlatform.buildRustPackage rec { }; }; + postPatch = '' + substituteInPlace lapce-ui/Cargo.toml --replace ", \"lapce-data/updater\"" "" + ''; + nativeBuildInputs = [ cmake pkg-config perl - copyDesktopItems wrapGAppsHook # FIX: No GSettings schemas are installed on the system gobject-introspection ]; @@ -112,19 +113,10 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg + install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop ''; - desktopItems = [ (makeDesktopItem { - name = "lapce"; - exec = "lapce %F"; - icon = "lapce"; - desktopName = "Lapce"; - comment = meta.description; - genericName = "Code Editor"; - categories = [ "Development" "Utility" "TextEditor" ]; - }) ]; - passthru.updateScript = nix-update-script { }; meta = with lib; { |