Unverified Commit 02f19093 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #261517 from wegank/gnunet-darwin 

gnunet: add darwin support
parents 935f2159 80571749

pkgs/applications/networking/p2p/gnunet/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec { 
    homepage = "https://gnunet.org/";

    license = licenses.agpl3Plus;

    maintainers = with maintainers; [ pstn vrthra ];

    platforms = platforms.gnu ++ platforms.linux;

    platforms = platforms.unix;

    changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}";

  };

}

pkgs/development/libraries/libextractor/default.nix

+7 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, substituteAll

, libtool, gettext, zlib, bzip2, flac, libvorbis

, exiv2, libgsf, rpm, pkg-config

, exiv2, libgsf, pkg-config

, rpmSupport ? stdenv.isLinux, rpm

, gstreamerSupport ? true, gst_all_1

# ^ Needed e.g. for proper id3 and FLAC support.

#   Set to `false` to decrease package closure size by about 87 MB (53%).
@@ -52,8 +53,9 @@ stdenv.mkDerivation rec { 


  buildInputs =

   [ libtool gettext zlib bzip2 flac libvorbis exiv2

     libgsf rpm

   ] ++ lib.optionals gstreamerSupport

     libgsf

   ] ++ lib.optionals rpmSupport [ rpm ]

     ++ lib.optionals gstreamerSupport

          ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)

     ++ lib.optionals gtkSupport [ glib gtk3 ]

     ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ];
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec { 
  # Checks need to be run after "make install", otherwise plug-ins are not in

  # the search path, etc.

  doCheck = false;

  doInstallCheck = true;

  doInstallCheck = !stdenv.isDarwin;

  installCheckPhase = "make check";



  meta = with lib; {
@@ -98,6 +100,6 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl3Plus;



    maintainers = [ maintainers.jorsn ];

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}

pkgs/development/libraries/libgnurl/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 
    description = "A fork of libcurl used by GNUnet";

    homepage    = "https://gnunet.org/en/gnurl.html";

    maintainers = with maintainers; [ vrthra ];

    platforms = platforms.linux;

    platforms = platforms.unix;

    license = licenses.curl;

  };

}