From 76665d0f3476efbf80c51fddc74768f8e9d3172d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 29 May 2024 21:21:50 +0400 Subject: [PATCH] knxd: fix cross-compilation --- pkgs/servers/knxd/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/knxd/default.nix b/pkgs/servers/knxd/default.nix index 2ae193037449..38e09d579745 100644 --- a/pkgs/servers/knxd/default.nix +++ b/pkgs/servers/knxd/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , fetchFromGitHub , autoreconfHook , pkg-config @@ -12,19 +13,19 @@ , withUsb ? stdenv.isLinux, libusb1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "knxd"; version = "0.14.61"; src = fetchFromGitHub { owner = "knxd"; repo = "knxd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-b8svjGaxW8YqonhXewebDUitezKoMcZxcUFGd2EKZQ4="; }; postPatch = '' - sed -i '2i echo ${version}; exit' tools/version.sh + sed -i '2i echo ${finalAttrs.version}; exit' tools/version.sh sed -i '2i exit' tools/get_libfmt ''; @@ -35,8 +36,12 @@ stdenv.mkDerivation rec { ++ lib.optional withUsb libusb1 ++ lib.optional stdenv.isDarwin argp-standalone; - configureFlags = lib.optional (!withSystemd) "--disable-systemd" - ++ lib.optional (!withUsb) "--disable-usb"; + configureFlags = [ + (lib.enableFeature withSystemd "systemd") + (lib.enableFeature withUsb "usb") + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; installFlags = lib.optionals withSystemd [ "systemdsystemunitdir=$(out)/lib/systemd/system" @@ -50,5 +55,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} - +})