summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-11 15:03:42 -0400
committerGitHub <noreply@github.com>2020-08-11 15:03:42 -0400
commit43f277156c52141c89025ed6a3854f870db38033 (patch)
treee5d5046c0d0542f627e47a1d6c073cd8e69222f5
parent595c6ef2ba0595577e9060a3c3ae7a7aacdc94f6 (diff)
parent2965fc3e1e29d772ef08a203f0f767f7c215d99b (diff)
downloadpodman-43f277156c52141c89025ed6a3854f870db38033.tar.gz
podman-43f277156c52141c89025ed6a3854f870db38033.tar.bz2
podman-43f277156c52141c89025ed6a3854f870db38033.zip
Merge pull request #7286 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
-rw-r--r--nix/default.nix9
-rw-r--r--nix/nixpkgs.json6
2 files changed, 12 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix
index 4fe818b39..cc8786ce0 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 8eeb4f470..976284ed4 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
}