From 49abca3fdee3a696410cbc755d65e4601fd6b82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= Date: Wed, 3 Sep 2025 17:30:49 +0000 Subject: [PATCH] nfs-ganesha: Coding style updates from review Co-authored-by: Markus Kowalewski --- pkgs/by-name/nf/nfs-ganesha/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index afeff6439196..8825d169e0da 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { ++ lib.optionals useDbus [ "-DUSE_DBUS=ON" "-DDBUS_NO_PKGCONFIG=ON" - "-DDBUS_LIBRARY_DIRS=${dbus.lib}/lib" - "-DDBUS_INCLUDE_DIRS=${dbus.dev}/include/dbus-1.0\\;${dbus.lib}/lib/dbus-1.0/include" + "-DDBUS_LIBRARY_DIRS=${lib.getLib dbus}/lib" + "-DDBUS_INCLUDE_DIRS=${lib.getDev dbus}/include/dbus-1.0\\;${lib.getLib dbus}/lib/dbus-1.0/include" "-DDBUS_LIBRARIES=dbus-1" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { flex sphinx ] - ++ lib.optional useDbus dbus.dev; + ++ lib.optional useDbus dbus; buildInputs = [ acl