Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 5 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/development/pure-modules/octave/default.nix b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
index d064eeb0d41f..591555f39c8e 100644
--- a/nixpkgs/pkgs/development/pure-modules/octave/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, octave }:
+{ lib, stdenv, fetchurl, pkg-config, pure, octave }:
 
 stdenv.mkDerivation rec {
   baseName = "octave";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure octave ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An Octave module for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-octave.html";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     # This is set to none for now because it does not work with the
     # current stable version of Octave.
-    platforms = stdenv.lib.platforms.none;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    platforms = lib.platforms.none;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }