diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-14 15:45:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 15:45:01 -0400 |
| commit | bf5fee92139b0ae4e154e80345849e349043b7cb (patch) | |
| tree | f7e12bd11cc4e37308a46a2624c6bcf6c74675ec | |
| parent | ce4c23c4af3adb6b2d41d337720bb78be5db0f71 (diff) | |
| parent | 92c9def930342adfecbcb55d93d5097ea0e46ec7 (diff) | |
| download | podman-bf5fee92139b0ae4e154e80345849e349043b7cb.tar.gz podman-bf5fee92139b0ae4e154e80345849e349043b7cb.tar.bz2 podman-bf5fee92139b0ae4e154e80345849e349043b7cb.zip | |
Merge pull request #10931 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
| -rw-r--r-- | nix/default-arm64.nix | 5 | ||||
| -rw-r--r-- | nix/default.nix | 7 | ||||
| -rw-r--r-- | nix/nixpkgs.json | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix index d29f75520..8868788ae 100644 --- a/nix/default-arm64.nix +++ b/nix/default-arm64.nix @@ -30,8 +30,10 @@ let "--enable-confdir=/etc" "--enable-usbdropdir=/var/lib/pcsc/drivers" "--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: { outputs = [ "out" "dev" ]; @@ -69,6 +71,7 @@ let export LDFLAGS='-s -w -static-libgcc -static' 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 CGO_ENABLED=1 ''; buildPhase = '' patchShebangs . diff --git a/nix/default.nix b/nix/default.nix index f6194e3d9..4d15532c2 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -27,9 +27,11 @@ let configureFlags = [ "--enable-confdir=/etc" "--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: { outputs = [ "out" "dev" ]; @@ -67,6 +69,7 @@ let export LDFLAGS='-s -w -static-libgcc -static' 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 CGO_ENABLED=1 ''; buildPhase = '' patchShebangs . diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index a9771eade..efcfe202e 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366", - "date": "2021-06-09T01:18:50-04:00", - "path": "/nix/store/fixgn194626rb7gf99l9jaqm0hbqn2ix-nixpkgs", - "sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6", + "rev": "2a96414d7e350160a33ed0978449c9ff5b5a6eb3", + "date": "2021-07-13T18:21:47+02:00", + "path": "/nix/store/2ai9q8ac6vxb2rrngdz82y8jxnk15cvm-nixpkgs", + "sha256": "1dzrfqdjq3yq5jjskiqflzy58l2xx6059gay9p1k07zrlm1wigy5", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false |