Commit 8b1d659c authored by R. RyanTM's avatar R. RyanTM Committed by Jörg Thalheim
Browse files

ksmbd-tools: 3.4.9 -> 3.5.0

parent c44a609d
Loading
Loading
Loading
Loading
+38 −0
Original line number Diff line number Diff line
From 592de67191a3969fcccef6293740c7142793d461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Nov 2023 21:54:05 +0100
Subject: [PATCH] skip installing example configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This requires root if prefix dir is pointed to /etc,
which we cannot do in nix builds.

Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
 meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 5f5935f..8373013 100644
--- a/meson.build
+++ b/meson.build
@@ -114,10 +114,10 @@ else
   runstatedir = rundir
 endif
 
-install_data(
-  sources: 'ksmbd.conf.example',
-  install_dir: get_option('sysconfdir') / 'ksmbd',
-)
+#install_data(
+#  sources: 'ksmbd.conf.example',
+#  install_dir: get_option('sysconfdir') / 'ksmbd',
+#)
 
 systemdsystemunitdir = get_option('systemdsystemunitdir')
 if systemdsystemunitdir == ''
-- 
2.42.0
+10 −9
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, meson
, ninja
, glib
, libkrb5
, libnl
@@ -13,22 +13,23 @@

stdenv.mkDerivation rec {
  pname = "ksmbd-tools";
  version = "3.4.9";
  version = "3.5.0";

  src = fetchFromGitHub {
    owner = "cifsd-team";
    repo = pname;
    rev = version;
    sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk=";
    sha256 = "sha256-8mjfKCazigHnuN7Egf11ZuD+nQx7ZTesn0a4LsVvV/M=";
  };

  buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5;

  nativeBuildInputs = [ autoconf automake libtool pkg-config ];

  preConfigure = "./autogen.sh";

  configureFlags = lib.optional withKerberos "--enable-krb5";
  nativeBuildInputs = [ meson ninja libtool pkg-config ];
  patches = [ ./0001-skip-installing-example-configuration.patch ];
  mesonFlags = [
    "-Drundir=/run"
    "--sysconfdir /etc"
  ];

  meta = with lib; {
    description = "Userspace utilities for the ksmbd kernel SMB server";