commit 6adc09ed308e088481728c7f25ecabf609764254 · pyrox.dev/nixpkgs

+17 -2

pkgs/servers/dns/knot-dns/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring

     

       2
       2
        
       , systemd, nettle, libedit, zlib, libiconv, libintl

     

       3
       3
       +
       , autoreconfHook

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       let inherit (stdenv.lib) optional optionals; in

     
···

       16
       17
        
       

     

       17
       18
        
         outputs = [ "bin" "out" "dev" ];

     

       18
       19
        
       

     

       19
       19
       -
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
       +
         configureFlags = [

     

       21
       21
       +
           "--with-configdir=/etc/knot"

     

       22
       22
       +
           "--with-rundir=/run/knot"

     

       23
       23
       +
           "--with-storage=/var/lib/knot"

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           # Don't try to create directories like /var/lib/knot at build time.

     

       28
       28
       +
           # They are later created from NixOS itself.

     

       29
       29
       +
           ./dont-create-run-time-dirs.patch

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [ pkgconfig autoreconfHook ];

     

       20
       33
        
         buildInputs = [

     

       21
       34
        
           gnutls liburcu libidn2 libunistring

     

       22
       35
        
           nettle libedit

     
···

       33
       46
        
         doCheck = true;

     

       34
       47
        
         doInstallCheck = false; # needs pykeymgr?

     

       35
       48
        
       

     

       36
       36
       -
         postInstall = ''rm -r "$out"/var "$out"/lib/*.la'';

     

       49
       49
       +
         postInstall = ''

     

       50
       50
       +
           rm -r "$out"/lib/*.la

     

       51
       51
       +
         '';

     

       37
       52
        
       

     

       38
       53
        
         meta = with stdenv.lib; {

     

       39
       54
        
           description = "Authoritative-only DNS server from .cz domain registry";

+32

pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch

···

       1
       1
       +
       diff --git a/samples/Makefile.am b/samples/Makefile.am

     

       2
       2
       +
       index c253c91..107401d 100644

     

       3
       3
       +
       --- a/samples/Makefile.am

     

       4
       4
       +
       +++ b/samples/Makefile.am

     

       5
       5
       +
       @@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone

     

       6
       6
       +
        

     

       7
       7
       +
        if HAVE_DAEMON

     

       8
       8
       +
        

     

       9
       9
       +
       -install-data-local: knot.sample.conf

     

       10
       10
       +
       -	if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \

     

       11
       11
       +
       -	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \

     

       12
       12
       +
       -	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \

     

       13
       13
       +
       -	fi

     

       14
       14
       +
        uninstall-local:

     

       15
       15
       +
        	-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \

     

       16
       16
       +
        	        $(DESTDIR)/$(config_dir)/example.com.zone

     

       17
       17
       +
       diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc

     

       18
       18
       +
       index e6765d9..d859d23 100644

     

       19
       19
       +
       --- a/src/utils/Makefile.inc

     

       20
       20
       +
       +++ b/src/utils/Makefile.inc

     

       21
       21
       +
       @@ -79,11 +79,6 @@ endif HAVE_DNSTAP

     

       22
       22
       +
        endif HAVE_UTILS

     

       23
       23
       +
        

     

       24
       24
       +
        if HAVE_DAEMON

     

       25
       25
       +
       -# Create storage and run-time directories

     

       26
       26
       +
       -install-data-hook:

     

       27
       27
       +
       -	$(INSTALL) -d $(DESTDIR)/@config_dir@

     

       28
       28
       +
       -	$(INSTALL) -d $(DESTDIR)/@run_dir@

     

       29
       29
       +
       -	$(INSTALL) -d $(DESTDIR)/@storage_dir@

     

       30
       30
       +
        

     

       31
       31
       +
        sbin_PROGRAMS = knotc knotd

     

       32
       32
       +