Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

2 files changed, 8 insertions, 25 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
index fc857bf1ad46..2814d6c5c1ea 100644
--- a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
@@ -1,35 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, gtk-doc, docbook_xsl, glib }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
 
-# TODO: Add installed tests once https://gitlab.gnome.org/Incubator/libcloudproviders/issues/4 is fixed
+# TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed
 
-let
+stdenv.mkDerivation rec {
   pname = "libcloudproviders";
-  version = "0.2.5";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "0.3.0";
 
   src = fetchurl {
-    url = "https://gitlab.gnome.org/Incubator/${pname}/repository/archive.tar.gz?ref=${version}";
-    sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g";
+    url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}";
+    sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l";
   };
 
-  patches = [
-    ./fix-include.patch
-  ];
-
   outputs = [ "out" "dev" "devdoc" ];
 
   mesonFlags = [
     "-Denable-gtk-doc=true"
   ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ];
 
   buildInputs = [ glib ];
 
   meta = with stdenv.lib; {
     description = "DBus API that allows cloud storage sync clients to expose their services";
-    homepage = https://gitlab.gnome.org/Incubator/libcloudproviders;
+    homepage = https://gitlab.gnome.org/World/libcloudproviders;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libcloudproviders/fix-include.patch b/nixpkgs/pkgs/development/libraries/libcloudproviders/fix-include.patch
deleted file mode 100644
index d6f626436a62..000000000000
--- a/nixpkgs/pkgs/development/libraries/libcloudproviders/fix-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -46,7 +46,7 @@
- bindir = get_option ('bindir')
- datadir = get_option ('datadir')
- servicedir = join_paths (datadir, 'dbus-1', 'services')
--incdir = join_paths (prefix, 'include', 'cloudproviders')
-+incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders')
- 
- gnome = import('gnome')
-