diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-14 15:49:30 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-14 15:50:32 +0100 |
| commit | 01dbf4368d2031c07cbbc3f8c1bb714ea60c080c (patch) | |
| tree | b58ac7dbd770b2fb24baad834513eae36e658e98 /pkgs/development/libraries/libcloudproviders | |
| parent | 429166fea23e372ca1e5df2b1d062394ba4505cb (diff) | |
| download | nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar.gz nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar.bz2 nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar.lz nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar.xz nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.tar.zst nixpkgs-01dbf4368d2031c07cbbc3f8c1bb714ea60c080c.zip | |
libcloudproviders: 0.2.5 → 0.3.0
Diffstat (limited to 'pkgs/development/libraries/libcloudproviders')
| -rw-r--r-- | pkgs/development/libraries/libcloudproviders/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcloudproviders/fix-include.patch | 11 |
2 files changed, 8 insertions, 25 deletions
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index fc857bf1ad4..2814d6c5c1e 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/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/pkgs/development/libraries/libcloudproviders/fix-include.patch b/pkgs/development/libraries/libcloudproviders/fix-include.patch deleted file mode 100644 index d6f626436a6..00000000000 --- a/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') - |