Merge branch 'add-libhandy'

flatpak/app.sublimemusic.SublimeMusic.json

@@ -68,7 +68,9 @@
         "pip3 install --prefix=/app ."
       ],
       "build-options": {
-        "build-args": [ "--share=network" ]
+        "build-args": [
+          "--share=network"
+        ]
       },
       "sources": [
         {
@@ -169,6 +171,25 @@
               ]
             }
           ]
+        },
+        {
+          "name": "libhandy",
+          "buildsystem": "meson",
+          "builddir": true,
+          "config-opts": [
+            "-Dexamples=false",
+            "-Dglade_catalog=disabled",
+            "-Dintrospection=disabled",
+            "-Dtests=false",
+            "-Dvapi=false"
+          ],
+          "sources": [
+            {
+              "type": "git",
+              "branch": "flap-handle",
+              "url": "https://gitlab.gnome.org/BenjaminSchaaf/libhandy.git"
+            }
+          ]
         }
       ]
     }

shell.nix

@@ -1,12 +1,32 @@
-{ pkgs ? import <nixpkgs> {} }: with pkgs;
+let
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (
+        self: super: {
+          libhandy = super.libhandy.overrideAttrs (
+            old: {
+              src = pkgs.fetchFromGitLab {
+                domain = "gitlab.gnome.org";
+                owner = "BenjaminSchaaf";
+                repo = "libhandy";
+                rev = "14431ed38cd0d655678497310a6400c7ee5ce68f";
+                sha256 = "1528m91h5pllacalmih7fy3gf7f3s1kq0n3kix1gc1q43wkbjq91";
+              };
+            }
+          );
+        }
+      )
+    ];
+  };
+in
 pkgs.mkShell {
-  nativeBuildInputs = [
+  nativeBuildInputs = with pkgs; [
     gobject-introspection
     python3Packages.setuptools
     wrapGAppsHook
   ];
 
-  buildInputs = [
+  buildInputs = with pkgs; [
     bashInteractive
     flatpak
     flatpak-builder
@@ -15,6 +35,7 @@ pkgs.mkShell {
     glib
     gobjectIntrospection
     gtk3
+    libhandy
     libnotify
     pango
     pkgconfig