ksmbd-tools: 3.4.9 -> 3.5.0

authored by R. Ryantm and committed by Jörg Thalheim 8b1d659c c44a609d

+48 -9
+38
pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch
··· 1 + From 592de67191a3969fcccef6293740c7142793d461 Mon Sep 17 00:00:00 2001 2 + From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> 3 + Date: Wed, 1 Nov 2023 21:54:05 +0100 4 + Subject: [PATCH] skip installing example configuration 5 + MIME-Version: 1.0 6 + Content-Type: text/plain; charset=UTF-8 7 + Content-Transfer-Encoding: 8bit 8 + 9 + This requires root if prefix dir is pointed to /etc, 10 + which we cannot do in nix builds. 11 + 12 + Signed-off-by: Jörg Thalheim <joerg@thalheim.io> 13 + --- 14 + meson.build | 8 ++++---- 15 + 1 file changed, 4 insertions(+), 4 deletions(-) 16 + 17 + diff --git a/meson.build b/meson.build 18 + index 5f5935f..8373013 100644 19 + --- a/meson.build 20 + +++ b/meson.build 21 + @@ -114,10 +114,10 @@ else 22 + runstatedir = rundir 23 + endif 24 + 25 + -install_data( 26 + - sources: 'ksmbd.conf.example', 27 + - install_dir: get_option('sysconfdir') / 'ksmbd', 28 + -) 29 + +#install_data( 30 + +# sources: 'ksmbd.conf.example', 31 + +# install_dir: get_option('sysconfdir') / 'ksmbd', 32 + +#) 33 + 34 + systemdsystemunitdir = get_option('systemdsystemunitdir') 35 + if systemdsystemunitdir == '' 36 + -- 37 + 2.42.0 38 +
+10 -9
pkgs/os-specific/linux/ksmbd-tools/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , autoconf 5 - , automake 4 + , meson 5 + , ninja 6 6 , glib 7 7 , libkrb5 8 8 , libnl ··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "ksmbd-tools"; 16 - version = "3.4.9"; 16 + version = "3.5.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "cifsd-team"; 20 20 repo = pname; 21 21 rev = version; 22 - sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk="; 22 + sha256 = "sha256-8mjfKCazigHnuN7Egf11ZuD+nQx7ZTesn0a4LsVvV/M="; 23 23 }; 24 24 25 25 buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; 26 26 27 - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; 28 - 29 - preConfigure = "./autogen.sh"; 30 - 31 - configureFlags = lib.optional withKerberos "--enable-krb5"; 27 + nativeBuildInputs = [ meson ninja libtool pkg-config ]; 28 + patches = [ ./0001-skip-installing-example-configuration.patch ]; 29 + mesonFlags = [ 30 + "-Drundir=/run" 31 + "--sysconfdir /etc" 32 + ]; 32 33 33 34 meta = with lib; { 34 35 description = "Userspace utilities for the ksmbd kernel SMB server";