Merge pull request containers#10931 from alvistack/master-linux-amd64

Update nix pin with `make nixpkgs`
rhatdan · Jul 14, 2021 · bf5fee9 · bf5fee9
2 parents ce4c23c + 92c9def
commit bf5fee9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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