Fix CI, Fix Nix build

Author: ranfdev

.github/workflows/build-flatpak.yml

@@ -1,12 +1,15 @@
-name: "Build flatpak"
+name: "Build and test"
 on:
   pull_request:
   push:
 jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - run: sudo apt install flatpak-builder flatpak jq
-    - run: bash ./build-aux/build-flatpak.sh build ./build-aux/com.ranfdev.Geopard.json
-
+    - uses: actions/[email protected]
+    - uses: cachix/install-nix-action@v15
+      with:
+        extra_nix_config: |
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+    - run: nix build
+    - run: nix flake check

README.gemini

@@ -32,13 +32,12 @@ If you have gnome-builder installed, use it to the open the folder of the source
 code and hit the run button.
 
 ### Build with Nix
-** currently broken **
 If you have the 
 => https://nixos.org/ nix
-package manager, you can simply do:
+package manager and flakes enabled, you can simply do:
 ```sh
 git clone https://github.com/ranfdev/Geopard.git
-nix-build nix/default.nix
+nix build
 ./result/bin/geopard
 ```
 

flake.lock

@@ -1,12 +1,16 @@
 {
   description = "A gemini browser";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
-  };
-  outputs = { self, nixpkgs }:
-  with import nixpkgs { system = "x86_64-linux"; };
-  {
-    # geopard = callPackage ./nix/geopard.nix {};
-    build-flatpak = callPackage ./nix/build-flatpak.nix {};
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    microvm.url = "github:astro/microvm.nix";
+    microvm.inputs.nixpkgs.follows = "nixpkgs";
   };
+  outputs = { self, nixpkgs, microvm }:
+    with import nixpkgs { system = "x86_64-linux"; };
+    rec {
+      packages.x86_64-linux.blueprint-compiler = callPackage ./nix/blueprint-compiler.nix { };
+      packages.x86_64-linux.geopard = callPackage ./nix/geopard.nix { blueprint-compiler = packages.x86_64-linux.blueprint-compiler; };
+      packages.x86_64-linux.build-flatpak = callPackage ./nix/build-flatpak.nix { };
+      packages.x86_64-linux.default = packages.x86_64-linux.geopard;
+    };
 }

flake.nix

@@ -0,0 +1,53 @@
+{ python3
+, python3Packages
+, stdenv
+, fetchgit
+, meson
+, ninja
+, gtk4
+, glib
+, gobject-introspection
+, libadwaita
+, wrapGAppsHook4
+}:
+python3Packages.buildPythonApplication {
+  pname = "blueprint-compiler";
+  version = "0.1.0";
+
+  src = fetchgit {
+    url = "https://gitlab.gnome.org/jwestman/blueprint-compiler.git";
+    rev = "db2e662d3173f6348b86d2350d4e2f0340ec939c";
+    sha256 = "sha256-aFx+aUDpc9wNgG/NUyIDgSZnURFShyTH1HhDjElTApY=";
+  };
+
+  preBuild = ''
+    cat >setup.py <<'EOF'
+    from setuptools import setup
+    setup(
+      name='blueprint-compiler',
+      version='0.1.0',
+      scripts=[
+        "blueprint-compiler.py",
+      ],
+    )
+    EOF
+  '';
+  doCheck = false;
+  postInstall = ''
+    mv -v $out/bin/blueprint-compiler.py $out/bin/blueprint-compiler
+  '';
+  nativeBuildInputs = [
+    wrapGAppsHook4
+  ];
+  buildInputs = [
+    gtk4
+    glib
+    gobject-introspection
+    python3Packages.pygobject3
+    libadwaita
+    wrapGAppsHook4
+  ];
+  propagatedBuildInputs = [
+    gobject-introspection
+  ];
+}

nix/blueprint-compiler.nix

@@ -4,48 +4,70 @@
 , gtk4
 , libadwaita
 , pango
-, rustc
 , rustPlatform
+, rustfmt
 , openssl
 , pkg-config
 , lib
-, wrapGAppsHook
+, wrapGAppsHook4
 , meson
+, ninja
+, gdk-pixbuf
+, cmake
+, desktop-file-utils
+, gettext
+, blueprint-compiler
+, gobject-introspection
+, appstream-glib
 }:
 
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
   pname = "geopard";
-  version = "1.0.0-alpha";
+  version = "1.0.1";
 
-  src = lib.cleanSource ../.;
-  cargoSha256 = "sha256-X2gVBKl37+FnDlzAQnLN6I99pEliytW/pMgMY6tJPd4=";
+  src = ../.;
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-gqScVEkf/rw1W7Z4M5k1rr9VwOFuLKIUWxmjqxc1x00=";
+  };
 
   nativeBuildInputs = [
-    cargo
-    rustc
     openssl
+    gettext
+    glib # for glib-compile-schemas
+    meson
+    ninja
     pkg-config
+    rustPlatform.rust.cargo
+    rustPlatform.cargoSetupHook
+    rustPlatform.rust.rustc
+    wrapGAppsHook4
+    cmake
+    blueprint-compiler
+    desktop-file-utils
+    appstream-glib
+    blueprint-compiler
+    rustfmt
   ];
 
   buildInputs = [
+    desktop-file-utils
+    gdk-pixbuf
     glib
     gtk4
     libadwaita
-    pango
     openssl
-    wrapGAppsHook
-    meson
   ];
-
-  doCheck = false;
-
+  checkPhase = ''
+    cargo fmt --check
+  '';
+  doCheck = true;
   meta = with lib; {
-    homepage = "https://git.ranfdev.com/Geopard";
-    description = "Browse the geminiverse";
-    longDescription = ''
-      Geopard is a gemini browser. It's colored and fast.
-    '';
-    maintainers = [ "[email protected]" ];
+    homepage = "https://github.com/ranfdev/Geopard";
+    description = "Colorful, adaptive gemini browser";
+    maintainers = with maintainers; [ ranfdev ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };

nix/geopard.nix

@@ -9,6 +9,7 @@ use gtk::gio;
 use std::cell::RefCell;
 use std::rc::Rc;
 
+#[rustfmt::skip]
 mod build_config;
 mod common;
 mod config;
@@ -21,7 +22,6 @@ mod tab;
 mod window;
 
 use gtk::prelude::*;
-
 async fn read_config() -> anyhow::Result<config::Config> {
     toml::from_str(&async_fs::read_to_string(&*SETTINGS_FILE_PATH).await?)
         .context("Reading config file")