[file-roller/wip/gtk4] ci: Fix Nix build

[Jan Tojnar <jtojnar src gnome org>]

commit f967e4dc110014fada4e00336abdbf5e775c98e7
Author: Jan Tojnar <jtojnar gmail com>
Date:   Sun Oct 2 22:21:25 2022 +0200

    ci: Fix Nix build

 default.nix      |  6 +++---
 nix/sources.json |  6 +++---
 nix/sources.nix  | 22 +++++++++++++++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/default.nix b/default.nix
index 79cb8cac..e4f524ad 100644
--- a/default.nix
+++ b/default.nix
@@ -109,11 +109,11 @@ makeDerivation rec {
     file
     glib
     gnome.adwaita-icon-theme
-    gtk3
+    gtk4
     json-glib
     libarchive
-    libhandy
-    libportal-gtk3
+    libadwaita
+    libportal-gtk4
   ];
 
   mesonFlags = [
diff --git a/nix/sources.json b/nix/sources.json
index 7434121b..7c1fb98f 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68c63e60b8413260605efbe1ac5addaa099cdfb3",
-        "sha256": "1bwzlaz49s2z73bxyz7dmhd42sfjghl4j1519yj1fxzz8lrlslmc",
+        "rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796",
+        "sha256": "1szjzw7iznali6dxy9rljh2nnzwsc0fr1msrqbsvapyas3nl4y8j",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/68c63e60b8413260605efbe1ac5addaa099cdfb3.tar.gz";,
+        "url": "https://github.com/NixOS/nixpkgs/archive/10ecda252ce1b3b1d6403caeadbcc8f30d5ab796.tar.gz";,
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nix/sources.nix b/nix/sources.nix
index 1938409d..9a01c8ac 100644
--- a/nix/sources.nix
+++ b/nix/sources.nix
@@ -31,8 +31,28 @@ let
           if spec ? branch then "refs/heads/${spec.branch}" else
             if spec ? tag then "refs/tags/${spec.tag}" else
               abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;