public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into master

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-21 08:37:30 +02:00
parent 04ce4c3e42 ca6ee8f519
commit 86c7662be0
423 changed files with 9084 additions and 6323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/data/misc/shared-mime-info/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
, libxml2, glib}:
let version = "1.10"; in
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
};
nativeBuildInputs = [
pkgconfig gettext intltool perl perlXMLParser libxml2 glib
];
nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [ libxml2 glib ];
meta = with stdenv.lib; {
inherit version;