commit 42a5ad5c5ec9b9b309428ede6740e042ec7edaea · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/networking/minidlna.nix

···

       97
        
                   Type = "forking";

     

       98
        
                   PIDFile = "/run/minidlna/pid";

     

       99
        
                   ExecStart =

     

       100
       -
                     "@${pkgs.minidlna}/sbin/minidlna minidlna -P /run/minidlna/pid" +

     

       101
        
                     " -f ${pkgs.writeText "minidlna.conf" cfg.config}";

     

       102
        
                 };

     

       103
        
             };

···

       97
        
                   Type = "forking";

     

       98
        
                   PIDFile = "/run/minidlna/pid";

     

       99
        
                   ExecStart =

     

       100
       +
                     "@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" +

     

       101
        
                     " -f ${pkgs.writeText "minidlna.conf" cfg.config}";

     

       102
        
                 };

     

       103
        
             };

-57

pkgs/tools/networking/minidlna/config.patch

···

       1
       -
       diff -rc minidlna-1.0.24/genconfig.sh minidlna-1.0.24-new/genconfig.sh

     

       2
       -
       *** minidlna-1.0.24/genconfig.sh	2012-06-24 20:08:26.697884140 +0200

     

       3
       -
       --- minidlna-1.0.24-new/genconfig.sh	2012-06-24 20:10:44.742874979 +0200

     

       4
       -
       ***************

     

       5
       -
       *** 38,68 ****

     

       6
       -
         

     

       7
       -
         ${RM} ${CONFIGFILE}

     

       8
       -
         

     

       9
       -
       - # Detect if there are missing headers

     

       10
       -
       - # NOTE: This check only works with a normal distro

     

       11
       -
       - [ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"

     

       12
       -
       - [ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"

     

       13
       -
       - [ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"

     

       14
       -
       - [ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"

     

       15
       -
       - [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"

     

       16
       -
       - [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"

     

       17
       -
       - [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"

     

       18
       -
       - [ ! -e "/usr/include/ffmpeg/avutil.h" -a \

     

       19
       -
       -   ! -e "/usr/include/libavutil/avutil.h" -a \

     

       20
       -
       -   ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"

     

       21
       -
       - [ ! -e "/usr/include/ffmpeg/avformat.h" -a \

     

       22
       -
       -   ! -e "/usr/include/libavformat/avformat.h" -a \

     

       23
       -
       -   ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"

     

       24
       -
       - [ ! -e "/usr/include/ffmpeg/avcodec.h" -a \

     

       25
       -
       -   ! -e "/usr/include/libavcodec/avcodec.h" -a \

     

       26
       -
       -   ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"

     

       27
       -
       - if [ -n "$MISSING" ]; then

     

       28
       -
       - 	echo -e "\nERROR!  Cannot continue."

     

       29
       -
       - 	echo -e "The following required libraries are either missing, or are missing development headers:\n"

     

       30
       -
       - 	echo -e "$MISSING\n"

     

       31
       -
       - 	exit 1

     

       32
       -
       - fi

     

       33
       -
       - 

     

       34
       -
         echo "/* MiniDLNA Project" >> ${CONFIGFILE}

     

       35
       -
         echo " * http://sourceforge.net/projects/minidlna/" >> ${CONFIGFILE}

     

       36
       -
         echo " * (c) 2008-2009 Justin Maggard" >> ${CONFIGFILE}

     

       37
       -
       --- 38,43 ----

     

       38
       -
       diff -rc minidlna-1.0.24/Makefile minidlna-1.0.24-new/Makefile

     

       39
       -
       *** minidlna-1.0.24/Makefile	2012-06-24 20:16:08.673195909 +0200

     

       40
       -
       --- minidlna-1.0.24-new/Makefile	2012-06-24 20:16:18.615267052 +0200

     

       41
       -
       ***************

     

       42
       -
       *** 64,70 ****

     

       43
       -
         	$(INSTALL) -d $(ETCINSTALLDIR)

     

       44
       -
         	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)

     

       45
       -
         

     

       46
       -
       ! minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)

     

       47
       -
         	@echo Linking $@

     

       48
       -
         	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)

     

       49
       -
         

     

       50
       -
       --- 64,70 ----

     

       51
       -
         	$(INSTALL) -d $(ETCINSTALLDIR)

     

       52
       -
         	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)

     

       53
       -
         

     

       54
       -
       ! minidlna:	$(BASEOBJS) $(LNXOBJS) 

     

       55
       -
         	@echo Linking $@

     

       56
       -
         	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)

     

       57
       -

+5 -8

pkgs/tools/networking/minidlna/default.nix

···

       1
       -
       { stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }:

     

       2
        
       

     

       3
       -
       let version = "1.0.25"; in

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "minidlna-${version}";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
       -
           url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna_${version}_src.tar.gz";

     

       10
       -
           sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p";

     

       11
        
         };

     

       12
       -
       

     

       13
       -
         patches = [ ./config.patch ];

     

       14
        
       

     

       15
        
         preConfigure = ''

     

       16
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ffmpeg}/include/libavutil -I${ffmpeg}/include/libavcodec -I${ffmpeg}/include/libavformat"

     

       17
        
           export makeFlags="INSTALLPREFIX=$out"

     

       18
        
         '';

     

       19
        
       

     

       20
       -
         buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ];

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           description = "Media server software";

···

       1
       +
       { stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:

     

       2
        
       

     

       3
       +
       let version = "1.1.4"; in

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "minidlna-${version}";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
       +
           url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";

     

       10
       +
           sha256 = "9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314";

     

       11
        
         };

     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
        
         preConfigure = ''

     

       0
        
       
     

       14
        
           export makeFlags="INSTALLPREFIX=$out"

     

       15
        
         '';

     

       16
        
       

     

       17
       +
         buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];

     

       18
        
       

     

       19
        
         meta = {

     

       20
        
           description = "Media server software";

+1 -3

pkgs/top-level/all-packages.nix

···

       1971
        
       

     

       1972
        
         makebootfat = callPackage ../tools/misc/makebootfat { };

     

       1973
        
       

     

       1974
       -
         minidlna = callPackage ../tools/networking/minidlna {

     

       1975
       -
           ffmpeg = ffmpeg_0;

     

       1976
       -
         };

     

       1977
        
       

     

       1978
        
         mmv = callPackage ../tools/misc/mmv { };

     

       1979

···

       1971
        
       

     

       1972
        
         makebootfat = callPackage ../tools/misc/makebootfat { };

     

       1973
        
       

     

       1974
       +
         minidlna = callPackage ../tools/networking/minidlna { };

     

       0
        
       
     

       0
        
       
     

       1975
        
       

     

       1976
        
         mmv = callPackage ../tools/misc/mmv { };

     

       1977