···

       
97
       
97
       
 
       
            Type = "forking";

     

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

     

       
99
       
99
       
 
       
            ExecStart =

     

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

     

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

     

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

     

       
102
       
102
       
 
       
          };

     

       
103
       
103
       
 
       
      };

     

···

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

     

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

     

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

     

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

     

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

     

       
6
       
6
       
-
       
  

     

       
7
       
7
       
-
       
  ${RM} ${CONFIGFILE}

     

       
8
       
8
       
-
       
  

     

       
9
       
9
       
-
       
- # Detect if there are missing headers

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       
31
       
31
       
-
       
- 	exit 1

     

       
32
       
32
       
-
       
- fi

     

       
33
       
33
       
-
       
- 

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       
45
       
45
       
-
       
  

     

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

     

       
47
       
47
       
-
       
  	@echo Linking $@

     

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

     

       
49
       
49
       
-
       
  

     

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

     

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

     

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

     

       
53
       
53
       
-
       
  

     

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

     

       
55
       
55
       
-
       
  	@echo Linking $@

     

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

     

       
57
       
57
       
-
       
  

     

···

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

     

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

     

       
2
       
2
       
 
       


     

       
3
       
3
       
-
       
let version = "1.0.25"; in

     

       
3
       
3
       
+
       
let version = "1.1.4"; in

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

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

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
  src = fetchurl {

     

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

     

       
10
       
10
       
-
       
    sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p";

     

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

     

       
10
       
10
       
+
       
    sha256 = "9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314";

     

       
11
       
11
       
 
       
  };

     

       
12
       
12
       
-
       


     

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

     

       
14
       
12
       
 
       


     

       
15
       
13
       
 
       
  preConfigure = ''

     

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

     

       
17
       
14
       
 
       
    export makeFlags="INSTALLPREFIX=$out"

     

       
18
       
15
       
 
       
  '';

     

       
19
       
16
       
 
       


     

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

     

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

     

       
21
       
18
       
 
       


     

       
22
       
19
       
 
       
  meta = {

     

       
23
       
20
       
 
       
    description = "Media server software";

     

···

       
1971
       
1971
       
 
       


     

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

     

       
1973
       
1973
       
 
       


     

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

     

       
1975
       
1975
       
-
       
    ffmpeg = ffmpeg_0;

     

       
1976
       
1976
       
-
       
  };

     

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

     

       
1977
       
1975
       
 
       


     

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

     

       
1979
       
1977