containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update nix pin with `make nixpkgs` 

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
This commit is contained in:
Wong Hoi Sing Edison 2021-06-17 14:47:19 +08:00
parent 9d98f56a64
commit 92c9def930
No known key found for this signature in database
GPG Key ID: 0F0D6A60644E28D3
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nix/default-arm64.nix
View File

@ -30,8 +30,10 @@ let
"--enable-confdir=/etc" "--enable-confdir=/etc"
"--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-usbdropdir=/var/lib/pcsc/drivers"
"--disable-libsystemd" "--disable-libsystemd"
"--disable-libudev"
"--disable-libusb"
]; ];
buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ]; buildInputs = [ pkgs.python3 pkgs.dbus ];
}); });
systemd = (static pkg.systemd).overrideAttrs (x: { systemd = (static pkg.systemd).overrideAttrs (x: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -69,6 +71,7 @@ let
export LDFLAGS='-s -w -static-libgcc -static' export LDFLAGS='-s -w -static-libgcc -static'
export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"' export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux' export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux'
export CGO_ENABLED=1
''; '';
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .

7
nix/default.nix
View File

@ -27,9 +27,11 @@ let
configureFlags = [ configureFlags = [
"--enable-confdir=/etc" "--enable-confdir=/etc"
"--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-usbdropdir=/var/lib/pcsc/drivers"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" "--disable-libsystemd"
"--disable-libudev"
"--disable-libusb"
]; ];
buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ]; buildInputs = [ pkgs.python3 pkgs.dbus ];
}); });
systemd = (static pkg.systemd).overrideAttrs (x: { systemd = (static pkg.systemd).overrideAttrs (x: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -67,6 +69,7 @@ let
export LDFLAGS='-s -w -static-libgcc -static' export LDFLAGS='-s -w -static-libgcc -static'
export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"' export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux' export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux'
export CGO_ENABLED=1
''; '';
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .

8
nix/nixpkgs.json
View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/nixos/nixpkgs", "url": "https://github.com/nixos/nixpkgs",
"rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366", "rev": "2a96414d7e350160a33ed0978449c9ff5b5a6eb3",
"date": "2021-06-09T01:18:50-04:00", "date": "2021-07-13T18:21:47+02:00",
"path": "/nix/store/fixgn194626rb7gf99l9jaqm0hbqn2ix-nixpkgs", "path": "/nix/store/2ai9q8ac6vxb2rrngdz82y8jxnk15cvm-nixpkgs",
"sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6", "sha256": "1dzrfqdjq3yq5jjskiqflzy58l2xx6059gay9p1k07zrlm1wigy5",
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false