Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 7 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix
index e5dc243ede11..ded2864dbc64 100644
--- a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix
@@ -1,4 +1,4 @@
- { stdenv, fetchurl, pkgconfig, freetype, gtk }:
+ { lib, stdenv, fetchurl, pkg-config, freetype, gtk }:
 
 stdenv.mkDerivation rec {
   version = "1.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ freetype gtk ];
 
   patches = [ ./Makefile.patch ];
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
     description = "Bitmap Font Editor";
     longDescription = ''
       gbdfed lets you interactively create new bitmap font files or modify existing ones.
-      It allows editing multiple fonts and multiple glyphs, 
+      It allows editing multiple fonts and multiple glyphs,
       it allows cut and paste operations between fonts and glyphs and editing font properties.
-      The editor works natively with BDF fonts. 
+      The editor works natively with BDF fonts.
     '';
     homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.linquize ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.linquize ];
+    platforms = lib.platforms.all;
   };
 }