From 2965fc3e1e29d772ef08a203f0f767f7c215d99b Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Mon, 10 Aug 2020 16:56:11 +0800
Subject: [PATCH] Update nix pin with `make nixpkgs`

Also sync nix `packageOverrides` across skopeo/buildah/podman/cri-o for
utilizing local build cache.

Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
---
 nix/default.nix  | 9 +++++++++
 nix/nixpkgs.json | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index 4fe818b398..cc8786ce0d 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -7,6 +7,15 @@ let
         libassuan = (static pkg.libassuan);
         libgpgerror = (static pkg.libgpgerror);
         libseccomp = (static pkg.libseccomp);
+        glib = (static pkg.glib).overrideAttrs(x: {
+          outputs = [ "bin" "out" "dev" ];
+          mesonFlags = [
+            "-Ddefault_library=static"
+            "-Ddevbindir=${placeholder ''dev''}/bin"
+            "-Dgtk_doc=false"
+            "-Dnls=disabled"
+          ];
+        });
       };
     };
   });
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
index 8eeb4f470b..976284ed4f 100644
--- a/nix/nixpkgs.json
+++ b/nix/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/nixos/nixpkgs",
-  "rev": "b49e7987632e4c7ab3a093fdfc433e1826c4b9d7",
-  "date": "2020-07-26T09:18:52+02:00",
-  "sha256": "1mj6fy0p24izmasl653s5z4f2ka9v3b6mys45kjrqmkv889yk2r6",
+  "rev": "d6a445fe821052861b379d9b6c02d21623c25464",
+  "date": "2020-08-11T04:28:16+01:00",
+  "sha256": "064scwaxg8qg4xbmq07hag57saa4bhsb4pgg5h5vfs4nhhwvchg9",
   "fetchSubmodules": false
 }