summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-06-18 03:59:02 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-06-18 05:03:38 +0200
commit7de340761d73139541a2234babc4cc0cd18abd9c (patch)
tree8bda46e83268a29123d62116f05116e21ed10a60 /pkgs/desktops
parentbf6974648ecb0ef7d81eed2a38766ba008996abb (diff)
downloadnixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar.gz
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar.bz2
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar.lz
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar.xz
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.tar.zst
nixlib-7de340761d73139541a2234babc4cc0cd18abd9c.zip
gnome3.grilo: clean up
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/grilo/default.nix26
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 08a6b784e9bd..ab35a3bd35ac 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, vala, glib, liboauth, gtk3
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 let
   pname = "grilo";
@@ -7,6 +8,9 @@ let
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputBin = "dev";
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
@@ -14,20 +18,24 @@ in stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+  configureFlags = [
+    "--enable-grl-pls"
+    "--enable-grl-net"
+    "--enable-gtk-doc"
+  ];
 
   preConfigure = ''
     for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$dev/share/gir-1.0/"
        substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser ];
-
-  propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
+  nativeBuildInputs = [
+    file intltool pkgconfig gobjectIntrospection vala
+    gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ];
 
   passthru = {
     updateScript = gnome3.updateScript {