Fix Nix build

Author: chuangzhu

flake.lock

@@ -1,29 +1,57 @@
 { stdenv
 , cargo
+, rustc
 , glib
 , gtk4
 , libadwaita
-, pango
 , rustPlatform
-, rustfmt
 , openssl
 , pkg-config
 , lib
-, wrapGAppsHook4
+, wrapGAppsHook
 , meson
 , ninja
 , gdk-pixbuf
 , cmake
 , desktop-file-utils
 , gettext
 , blueprint-compiler
-, gobject-introspection
 , appstream-glib
-, clippy
 , rust-analyzer
+, fetchFromGitLab
+, appstream
 }:
 
-stdenv.mkDerivation rec {
+let
+  gtk_4_11 = gtk4.overrideAttrs (old: rec {
+    version = "4.11.4";
+    src = fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "GNOME";
+      repo = "gtk";
+      rev = version;
+      hash = "sha256-YobWcLJm8owjrz6c6aPMCrVZqYDvNpjIt5Zea2CtAZY=";
+    };
+    postPatch = old.postPatch + ''
+      patchShebangs build-aux/meson/gen-visibility-macros.py
+    '';
+  });
+  wrapGAppsHook_4_11 = wrapGAppsHook.override { gtk3 = gtk_4_11; };
+
+  libadwaita_1_4 = (libadwaita.override { gtk4 = gtk_4_11; }).overrideAttrs (old: rec {
+    version = "1.4.alpha";
+    src = fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "GNOME";
+      repo = "libadwaita";
+      rev = version;
+      hash = "sha256-UUS5b6diRenpxxmGvVJoc6mVjEVGS9afLd8UKu+CJvI=";
+    };
+    buildInputs = old.buildInputs ++ [ appstream ];
+  });
+in
+
+stdenv.mkDerivation {
   pname = "geopard";
   version = "1.4.0";
 
@@ -45,10 +73,10 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     appstream-glib
     blueprint-compiler
-    rustPlatform.rust.cargo
+    cargo
     rustPlatform.cargoSetupHook
-    rustPlatform.rust.rustc
-    wrapGAppsHook4
+    rustc
+    wrapGAppsHook_4_11
   ];
 
   buildInputs = [
@@ -58,10 +86,11 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     gdk-pixbuf
     glib
-    gtk4
-    libadwaita
+    gtk_4_11
+    libadwaita_1_4
     openssl
   ];
+
   meta = with lib; {
     homepage = "https://github.com/ranfdev/Geopard";
     description = "Colorful, adaptive gemini browser";

nix/geopard.nix

@@ -550,7 +550,7 @@ impl Window {
         let imp = self.imp();
         let p = self.add_tab();
         imp.tab_view.set_selected_page(&p);
-        this.focus_url_bar();
+        self.focus_url_bar();
     }
     fn show_bookmarks(&self) {
         let imp = self.imp();