diff options
author | aszlig <aszlig@nix.build> | 2020-09-08 19:36:42 +0200 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2020-09-08 19:43:55 +0200 |
commit | d7f2e2f0b32717d75e7968ab638aec8136f7803e (patch) | |
tree | 5226981ac1531880847c2ef64871df31627ea884 | |
parent | a95812654f47eae50aeba9f9da71ee9d1163e8bc (diff) |
modules/gnupg: Use getLib to get systemd library
A recent change[1] has removed the lib output from the systemd package, so our GnuPG agent wrapper no longer compiles. Using getLib falls back to the "out" output if the "lib" output is unavailable and should be backwards- and forwards-compatible (in case the "lib" output is added back someday). [1]: https://github.com/NixOS/nixpkgs/commit/b68bddfbda2092c5fde2c4cece2 Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r-- | modules/programs/gnupg/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/programs/gnupg/default.nix b/modules/programs/gnupg/default.nix index a38f3874..99bbebe6 100644 --- a/modules/programs/gnupg/default.nix +++ b/modules/programs/gnupg/default.nix @@ -36,7 +36,7 @@ let } '' cc -Wall -shared -std=c11 \ ${lib.optionalString withSupervisor "-DSUPERVISOR_SUPPORT=1"} \ - -DLIBSYSTEMD=\"${pkgs.systemd.lib}/lib/libsystemd.so\" \ + -DLIBSYSTEMD=\"${lib.getLib pkgs.systemd}/lib/libsystemd.so\" \ -DPINENTRY_WRAPPER=\"$pinentryWrapper\" \ $(pkg-config --cflags libsystemd) -ldl \ "${./agent-wrapper.c}" -o "$out" -fPIC |