From 69a7f5986a2bc9c581df97a833ca1db49abc84b9 Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Fri, 28 Feb 2025 11:21:21 -0600 Subject: [PATCH 1/3] fix mesa in nix flake --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 32a39a6..03d74b2 100644 --- a/flake.nix +++ b/flake.nix @@ -100,8 +100,8 @@ shellHook = '' export LIBCLANG_PATH=${pkgs.libclang.lib}/lib/ # Add important Mesa paths - export LIBGL_DRIVERS_PATH=${pkgs.mesa.drivers}/lib/dri - export __EGL_VENDOR_LIBRARY_DIRS=${pkgs.mesa.drivers}/share/glvnd/egl_vendor.d/ + export LIBGL_DRIVERS_PATH=${pkgs.mesa}/lib/dri + export __EGL_VENDOR_LIBRARY_DIRS=${pkgs.mesa}/share/glvnd/egl_vendor.d/ # Wayland specific environment variables export XDG_RUNTIME_DIR=''${XDG_RUNTIME_DIR:-/run/user/$(id -u)} ''; From bdb74e01cf2528f69c550f56644b634fd66fb047 Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Fri, 28 Feb 2025 11:46:43 -0600 Subject: [PATCH 2/3] cleanup flake, use flakehub for releases bring bax dev shell on linux egl plz linux plz plz mesa --- .github/workflows/release.yml | 4 +++- flake.lock | 20 ++++++++++---------- flake.nix | 16 +++++++++------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fddd1db..8e4ff35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,8 +12,10 @@ on: type: string # Add permissions block +# id-token is for flakehub cache permissions: contents: write + id-token: write jobs: build-mac: @@ -23,7 +25,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/flakehub-cache-action@main - uses: DeterminateSystems/flake-checker-action@main - uses: Swatinem/rust-cache@v2 with: diff --git a/flake.lock b/flake.lock index 848b9b2..4aede5b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "lastModified": 1740709839, + "narHash": "sha256-4dF++MXIXna/AwlZWDKr7bgUmY4xoEwvkF1GewjNrt0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "rev": "b4270835bf43c6f80285adac6f66a26d83f0f277", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 03d74b2..629414a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-24.11"; }; outputs = @@ -44,10 +44,6 @@ pkgs.freetype.dev pkgs.libGL pkgs.pkg-config - pkgs.xorg.libX11 - pkgs.xorg.libXcursor - pkgs.xorg.libXi - pkgs.xorg.libXrandr pkgs.diesel-cli pkgs.nixfmt-rfc-style ] @@ -55,6 +51,12 @@ pkgs.darwin.apple_sdk.frameworks.AppKit pkgs.darwin.apple_sdk.frameworks.CoreText pkgs.darwin.apple_sdk.frameworks.WebKit + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + pkgs.xorg.libX11 + pkgs.xorg.libXcursor + pkgs.xorg.libXi + pkgs.xorg.libXrandr ]; in { @@ -100,8 +102,8 @@ shellHook = '' export LIBCLANG_PATH=${pkgs.libclang.lib}/lib/ # Add important Mesa paths - export LIBGL_DRIVERS_PATH=${pkgs.mesa}/lib/dri - export __EGL_VENDOR_LIBRARY_DIRS=${pkgs.mesa}/share/glvnd/egl_vendor.d/ + export LIBGL_DRIVERS_PATH=${if pkgs.mesa ? drivers then pkgs.mesa.drivers else pkgs.mesa}/lib/dri + export __EGL_VENDOR_LIBRARY_DIRS=${if pkgs.mesa ? drivers then pkgs.mesa.drivers else pkgs.mesa}/share/glvnd/egl_vendor.d/ # Wayland specific environment variables export XDG_RUNTIME_DIR=''${XDG_RUNTIME_DIR:-/run/user/$(id -u)} ''; From 06efe2a979d571bcdf1b18379c4fa85ad811a71e Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Fri, 28 Feb 2025 11:46:52 -0600 Subject: [PATCH 3/3] habor --- harbor-ui/assets/linux/cash.harbor.harbor.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harbor-ui/assets/linux/cash.harbor.harbor.desktop b/harbor-ui/assets/linux/cash.harbor.harbor.desktop index 83e453b..f7ce15a 100644 --- a/harbor-ui/assets/linux/cash.harbor.harbor.desktop +++ b/harbor-ui/assets/linux/cash.harbor.harbor.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Habor +Name=Harbor Comment=Fedimint ecash desktop wallet for better bitcoin privacy Type=Application Keywords=bitcoin;lightning;ecash;privacy;tor;fedimint;