diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 13:35:59 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 13:35:59 +0100 |
| commit | 0136206b12cdcee87d34ccdfd1864c0bb6541aec (patch) | |
| tree | eb6597b5dc6da16585f5e9a8d1649f44ea3f51b3 /pkgs/applications/networking/p2p | |
| parent | c31077a6020c4d365496a618ba07121b9331bc52 (diff) | |
| parent | de4012ac80df34f1b77f07c70e935e4908729e71 (diff) | |
| download | nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.gz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.bz2 nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.lz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.xz nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.tar.zst nixpkgs-0136206b12cdcee87d34ccdfd1864c0bb6541aec.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/gnunet/gtk.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/transmission/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 4090814b3da..ddeffd8b7e8 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gnome3 +, glade , gnunet , gnutls , gtk3 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.glade + glade gnunet gnutls gtk3 diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8cc674b1ea7..7e8b6b671cd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -12,7 +12,7 @@ , pcre # Build options , enableGTK3 ? false -, gnome3 +, gtk3 , xorg , wrapGAppsHook , enableQt ? false @@ -65,7 +65,7 @@ in stdenv.mkDerivation { pcre ] ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] - ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] + ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] ; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 6e2533621e6..3aa5b4a8da8 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; + broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053 }; } |