pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #261517 from wegank/gnunet-darwin

gnunet: add darwin support

authored by Weijia Wang and committed by GitHub 02f19093 935f2159

+9 -7
unified split
+1 -1
pkgs/applications/networking/p2p/gnunet/default.nix
··· 69 homepage = "https://gnunet.org/"; 70 license = licenses.agpl3Plus; 71 maintainers = with maintainers; [ pstn vrthra ]; 72 - platforms = platforms.gnu ++ platforms.linux; 73 changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}"; 74 }; 75 }
··· 69 homepage = "https://gnunet.org/"; 70 license = licenses.agpl3Plus; 71 maintainers = with maintainers; [ pstn vrthra ]; 72 + platforms = platforms.unix; 73 changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}"; 74 }; 75 }
+7 -5
pkgs/development/libraries/libextractor/default.nix
··· 1 { lib, stdenv, fetchurl, fetchpatch, substituteAll 2 , libtool, gettext, zlib, bzip2, flac, libvorbis 3 - , exiv2, libgsf, rpm, pkg-config 4 , gstreamerSupport ? true, gst_all_1 5 # ^ Needed e.g. for proper id3 and FLAC support. 6 # Set to `false` to decrease package closure size by about 87 MB (53%). ··· 52 53 buildInputs = 54 [ libtool gettext zlib bzip2 flac libvorbis exiv2 55 - libgsf rpm 56 - ] ++ lib.optionals gstreamerSupport 57 ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) 58 ++ lib.optionals gtkSupport [ glib gtk3 ] 59 ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; ··· 68 # Checks need to be run after "make install", otherwise plug-ins are not in 69 # the search path, etc. 70 doCheck = false; 71 - doInstallCheck = true; 72 installCheckPhase = "make check"; 73 74 meta = with lib; { ··· 98 license = licenses.gpl3Plus; 99 100 maintainers = [ maintainers.jorsn ]; 101 - platforms = platforms.linux; 102 }; 103 }
··· 1 { lib, stdenv, fetchurl, fetchpatch, substituteAll 2 , libtool, gettext, zlib, bzip2, flac, libvorbis 3 + , exiv2, libgsf, pkg-config 4 + , rpmSupport ? stdenv.isLinux, rpm 5 , gstreamerSupport ? true, gst_all_1 6 # ^ Needed e.g. for proper id3 and FLAC support. 7 # Set to `false` to decrease package closure size by about 87 MB (53%). ··· 53 54 buildInputs = 55 [ libtool gettext zlib bzip2 flac libvorbis exiv2 56 + libgsf 57 + ] ++ lib.optionals rpmSupport [ rpm ] 58 + ++ lib.optionals gstreamerSupport 59 ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) 60 ++ lib.optionals gtkSupport [ glib gtk3 ] 61 ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; ··· 70 # Checks need to be run after "make install", otherwise plug-ins are not in 71 # the search path, etc. 72 doCheck = false; 73 + doInstallCheck = !stdenv.isDarwin; 74 installCheckPhase = "make check"; 75 76 meta = with lib; { ··· 100 license = licenses.gpl3Plus; 101 102 maintainers = [ maintainers.jorsn ]; 103 + platforms = platforms.unix; 104 }; 105 }
+1 -1
pkgs/development/libraries/libgnurl/default.nix
··· 40 description = "A fork of libcurl used by GNUnet"; 41 homepage = "https://gnunet.org/en/gnurl.html"; 42 maintainers = with maintainers; [ vrthra ]; 43 - platforms = platforms.linux; 44 license = licenses.curl; 45 }; 46 }
··· 40 description = "A fork of libcurl used by GNUnet"; 41 homepage = "https://gnunet.org/en/gnurl.html"; 42 maintainers = with maintainers; [ vrthra ]; 43 + platforms = platforms.unix; 44 license = licenses.curl; 45 }; 46 }