diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-17 07:56:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 07:56:38 +0200 |
| commit | 02f19093946e59cfec028176c05c68beff2891bf (patch) | |
| tree | 2d41c7adea3416d9760735b62207039bba526312 | |
| parent | 935f21595130a9336dbecc99d8577f18e4c65d0f (diff) | |
| parent | 80571749c792725b5a7731ffa0920b45854c7666 (diff) | |
| download | nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar.gz nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar.bz2 nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar.lz nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar.xz nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.tar.zst nixpkgs-02f19093946e59cfec028176c05c68beff2891bf.zip | |
Merge pull request #261517 from wegank/gnunet-darwin
gnunet: add darwin support
| -rw-r--r-- | pkgs/applications/networking/p2p/gnunet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libextractor/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgnurl/default.nix | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index e593fd9f80a..27476d3b48a 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -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}"; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 5029e84d9c4..272cd3d9aa3 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,7 @@ { 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; }; } diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index bc9a09ab926..f2d3d15f9e8 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -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; }; } |