diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-05-08 14:43:43 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-05-08 14:43:43 +0200 |
commit | 9651084620116914e420e6a329d3a19ff00850a0 (patch) | |
tree | 720c3e96b38ffb1a2d1864adc922d9e5e15df830 /pkgs/applications/networking/p2p | |
parent | 0388b1a029975489a4867ce3de11e89331a4381a (diff) | |
parent | b28f0d640f9e91b8e77bca6ca18d105496bb928c (diff) | |
download | nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar.gz nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar.bz2 nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar.lz nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar.xz nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.tar.zst nixpkgs-9651084620116914e420e6a329d3a19ff00850a0.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/p2p')
-rw-r--r-- | pkgs/applications/networking/p2p/retroshare/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a39b4aab837..f0fb5a1239a 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; |