about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libnice
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-24 18:25:09 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-24 18:25:09 +0000
commitcb026a2bd22d2656d88a7883e44caa31402d7646 (patch)
tree804c389adfe6dc6deb38dfd90167b03b4f828bce /nixpkgs/pkgs/development/libraries/libnice
parent5781972383d0382dc9353ac720a5d751ca17cd05 (diff)
parent650a295621b27c4ebe0fa64a63fd25323e64deb3 (diff)
downloadnixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.gz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.bz2
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.lz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.xz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.zst
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.zip
Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libnice')
-rw-r--r--nixpkgs/pkgs/development/libraries/libnice/default.nix17
1 files changed, 2 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libnice/default.nix b/nixpkgs/pkgs/development/libraries/libnice/default.nix
index e71bcd0e3680..d6bb8ec50463 100644
--- a/nixpkgs/pkgs/development/libraries/libnice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnice/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "libnice-0.1.15";
+  name = "libnice-0.1.16";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "https://nice.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p";
+    sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6";
   };
 
   patches = [
@@ -18,19 +18,6 @@ stdenv.mkDerivation rec {
       url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch;
       sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg";
     })
-
-    # Fix test-different-number-streams
-    # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36
-    (fetchpatch {
-      url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch;
-      sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z";
-    })
-    # Fix test-gstreamer
-    # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35
-    (fetchpatch {
-      url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch;
-      sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0";
-    })
   ];
 
   nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];