From 5b9388a8ed8e16600b7f3fb8f8efc8aead093c18 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 3 Jun 2016 16:09:20 +0200
Subject: [PATCH] vifm: fixups

---
 pkgs/applications/misc/vifm/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 6cd91e7817cc..e5f3011e6bac 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,24 +1,26 @@
-{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11, which, groff }:
+{ stdenv, fetchurl
+, pkgconfig
+, ncurses, libX11
+, utillinux, file, which, groff
+}:
 
-let
+stdenv.mkDerivation rec {
   name = "vifm-${version}";
   version = "0.8.1";
 
-in stdenv.mkDerivation {
-  inherit name;
-
   src = fetchurl {
     url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
     sha256 = "0yf3xc4czdrcbvmhq7d4xkck5phrmxwybmnv1zdb56qg56baq64r";
   };
 
-  buildInputs = [ utillinux ncurses file libX11 which groff ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses libX11 utillinux file which groff ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A vi-like file manager";
-    maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
-    platforms = pkgs.lib.platforms.linux;
-    license = pkgs.lib.licenses.gpl2;
+    maintainers = with maintainers; [ raskin garbas ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 
   passthru = {