diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
| commit | 86c7662be0a2cef3d1d6f152e84ff436129dd2c1 (patch) | |
| tree | a195f510944c7d8f9a4efc683816491a05a269d9 /pkgs/data | |
| parent | 04ce4c3e42ec15c4420657052110d928dbdf5d84 (diff) | |
| parent | ca6ee8f519733e1f45b7598d995245dd687f535c (diff) | |
| download | nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.gz nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.bz2 nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.lz nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.xz nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.zst nixpkgs-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/shared-mime-info/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index f1df81f2db4..f82ae5f1f9f 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -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; |