diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-11 05:20:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 05:20:43 -0400 |
| commit | a634b2cd5977c60f1907733efe07b61ba36271fb (patch) | |
| tree | e123d33b9ad828982d3fd570c97d7a777c88a2fb /nix/default.nix | |
| parent | 08e39fe6def6acb6d39b74a176c47358186c8430 (diff) | |
| parent | e7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6 (diff) | |
| download | podman-a634b2cd5977c60f1907733efe07b61ba36271fb.tar.gz podman-a634b2cd5977c60f1907733efe07b61ba36271fb.tar.bz2 podman-a634b2cd5977c60f1907733efe07b61ba36271fb.zip | |
Merge pull request #10542 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
Diffstat (limited to 'nix/default.nix')
| -rw-r--r-- | nix/default.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nix/default.nix b/nix/default.nix index aae520c9e..f6194e3d9 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -23,6 +23,21 @@ let -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c ''; }); + pcsclite = (static pkg.pcsclite).overrideAttrs (x: { + configureFlags = [ + "--enable-confdir=/etc" + "--enable-usbdropdir=/var/lib/pcsc/drivers" + "--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" + ]; + buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ]; + }); + systemd = (static pkg.systemd).overrideAttrs (x: { + outputs = [ "out" "dev" ]; + mesonFlags = x.mesonFlags ++ [ + "-Dglib=false" + "-Dstatic-libsystemd=true" + ]; + }); }; }; }); @@ -45,8 +60,8 @@ let doCheck = false; enableParallelBuilding = true; outputs = [ "out" ]; - nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ]; - buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ]; + nativeBuildInputs = [ bash gitMinimal go-md2man pkg-config which ]; + buildInputs = [ glibc glibc.static glib gpgme libassuan libgpgerror libseccomp libapparmor libselinux ]; prePatch = '' export CFLAGS='-static -pthread' export LDFLAGS='-s -w -static-libgcc -static' |