steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

workaround(logseq): use self-built aarch64-linux appimage

Browse source
This commit is contained in:
steveej 2024-12-24 13:34:21 +01:00
parent 1acccd1213
commit 2068e953a3
5 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -998,16 +998,16 @@
}, },
"nixpkgs-logseq": { "nixpkgs-logseq": {
"locked": { "locked": {
"lastModified": 1732454357, "lastModified": 1735042470,
"narHash": "sha256-HIGUjCmPRHdjHHnq8Jb7Nr+atCZ5fIX15fNruoFwY0U=", "narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=",
"owner": "steveej-forks", "owner": "steveej-forks",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5eac36380d52534313b1c139c07a04bd0fcb3fdf", "rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "steveej-forks", "owner": "steveej-forks",
"ref": "logseq-linux-arm64", "ref": "logseq-linux-arm64-selfbuilt-appimage",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -81,7 +81,7 @@
flake = false; flake = false;
}; };
nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64"; nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage";
espanso = { espanso = {
flake = false; flake = false;

6
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -11,10 +11,6 @@ let
pkgsUnstable = pkgsUnstable =
pkgs.pkgsUnstable pkgs.pkgsUnstable
or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; }); or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; });
pkgsLogseq =
pkgs.pkgsLogseq
or (import repoFlake.inputs.nixpkgs-logseq { inherit (pkgs) system config overlays; });
in in
{ {
imports = [ imports = [
@ -250,7 +246,7 @@ in
# libretro.snes9x2010 # libretro.snes9x2010
# retroarchFull # retroarchFull
pkgsLogseq.logseq (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" {})
]) ])
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
pkgsUnstable.ledger-live-desktop pkgsUnstable.ledger-live-desktop

3
nix/os/devices/sj-srv1/flake.nix
View file

@ -8,8 +8,5 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
inputs.nixos-dns.url = "github:Janik-Haag/nixos-dns";
inputs.nixos-dns.inputs.nixpkgs.follows = "nixpkgs";
outputs = _: { }; outputs = _: { };
} }

1
nix/pkgs/logseq/Containerfile
View file

@ -10,6 +10,7 @@ FROM clojure:temurin-11-tools-deps-bullseye-slim as builder
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
# Install reqs # Install reqs
RUN echo 1
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl \ curl \
ca-certificates \ ca-certificates \