tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
0
fork
atom
overview
issues
pulls
pipelines
libcloudproviders: 0.2.5 → 0.3.0
Jan Tojnar
7 years ago
01dbf436
429166fe
+8
-25
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
libcloudproviders
default.nix
fix-include.patch
+8
-14
pkgs/development/libraries/libcloudproviders/default.nix
reviewed
···
1
1
-
{ stdenv, fetchurl, pkgconfig, meson, ninja, gtk-doc, docbook_xsl, glib }:
1
1
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
2
2
3
3
-
# TODO: Add installed tests once https://gitlab.gnome.org/Incubator/libcloudproviders/issues/4 is fixed
3
3
+
# TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed
4
4
5
5
-
let
5
5
+
stdenv.mkDerivation rec {
6
6
pname = "libcloudproviders";
7
7
-
version = "0.2.5";
8
8
-
in stdenv.mkDerivation rec {
9
9
-
name = "${pname}-${version}";
7
7
+
version = "0.3.0";
10
8
11
9
src = fetchurl {
12
12
-
url = "https://gitlab.gnome.org/Incubator/${pname}/repository/archive.tar.gz?ref=${version}";
13
13
-
sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g";
10
10
+
url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}";
11
11
+
sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l";
14
12
};
15
15
-
16
16
-
patches = [
17
17
-
./fix-include.patch
18
18
-
];
19
13
20
14
outputs = [ "out" "dev" "devdoc" ];
21
15
···
17
23
"-Denable-gtk-doc=true"
18
24
];
19
25
20
20
-
nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl ];
26
26
+
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ];
21
27
22
28
buildInputs = [ glib ];
23
29
24
30
meta = with stdenv.lib; {
25
31
description = "DBus API that allows cloud storage sync clients to expose their services";
26
26
-
homepage = https://gitlab.gnome.org/Incubator/libcloudproviders;
32
32
+
homepage = https://gitlab.gnome.org/World/libcloudproviders;
27
33
license = licenses.lgpl3Plus;
28
34
maintainers = with maintainers; [ jtojnar ];
29
35
platforms = platforms.unix;
-11
pkgs/development/libraries/libcloudproviders/fix-include.patch
reviewed
···
1
1
-
--- a/meson.build
2
2
-
+++ b/meson.build
3
3
-
@@ -46,7 +46,7 @@
4
4
-
bindir = get_option ('bindir')
5
5
-
datadir = get_option ('datadir')
6
6
-
servicedir = join_paths (datadir, 'dbus-1', 'services')
7
7
-
-incdir = join_paths (prefix, 'include', 'cloudproviders')
8
8
-
+incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders')
9
9
-
10
10
-
gnome = import('gnome')
11
11
-