summary refs log tree commit diff
path: root/pkgs/development/libraries/appstream-glib/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-02-26 10:50:18 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-02-26 10:50:18 +0100
commit4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch)
tree129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/development/libraries/appstream-glib/default.nix
parent6b381d4c9bed35caee62265a92986cec189243b2 (diff)
parent1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff)
downloadnixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst
nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/libraries/appstream-glib/default.nix')
-rw-r--r--pkgs/development/libraries/appstream-glib/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index dc5de2b382a..1ccfa85591f 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
-, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant
+, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant
 , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42
-, libuuid, json_glib, meson, gperf, ninja
+, libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.6";
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42
+    meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42
   ];
   buildInputs = [
     glib gettext sqlite libsoup
-    gcab attr acl libuuid json_glib
+    gcab attr acl libuuid json-glib
     libarchive gobjectIntrospection gperf
   ];
   propagatedBuildInputs = [ gtk3 ];