opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-11 09:05:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update nix pin with make nixpkgs

Browse Source 
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>
This commit is contained in:
Wong Hoi Sing Edison
2020-08-10 16:56:11 +08:00
parent df0ad51075
commit 2965fc3e1e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nix/default.nix
View File

@ -7,6 +7,15 @@ let
libassuan = (static pkg.libassuan); libassuan = (static pkg.libassuan);
libgpgerror = (static pkg.libgpgerror); libgpgerror = (static pkg.libgpgerror);
libseccomp = (static pkg.libseccomp); 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"
];
});
}; };
}; };
}); });

6
nix/nixpkgs.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/nixos/nixpkgs", "url": "https://github.com/nixos/nixpkgs",
"rev": "b49e7987632e4c7ab3a093fdfc433e1826c4b9d7", "rev": "d6a445fe821052861b379d9b6c02d21623c25464",
"date": "2020-07-26T09:18:52+02:00", "date": "2020-08-11T04:28:16+01:00",
"sha256": "1mj6fy0p24izmasl653s5z4f2ka9v3b6mys45kjrqmkv889yk2r6", "sha256": "064scwaxg8qg4xbmq07hag57saa4bhsb4pgg5h5vfs4nhhwvchg9",
"fetchSubmodules": false "fetchSubmodules": false
} }