about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
index a4e6bc1182be..a1e9fad45405 100644
--- a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
- autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
+{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
+ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
  liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
  openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
  rsync, glibc, rpcsvc-proto, libtirpc
@@ -15,7 +15,7 @@ let
 
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
-    autoconf automake libtool pkgconfig zlib libaio libxml2
+    autoconf automake libtool pkg-config zlib libaio libxml2
     acl sqlite liburcu attr makeWrapper util-linux libtirpc
     (python3.withPackages (pkgs: [
       pkgs.flask
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
     '';
 
   configureFlags = [
-    ''--localstatedir=/var''
+    "--localstatedir=/var"
     ];
 
   nativeBuildInputs = [ rpcsvc-proto ];
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
     # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly.
     # We set up the paths for the main entry point executables.
 
-    GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin"
+    GLUSTER_PATH="${lib.makeBinPath runtimePATHdeps}:$out/bin"
     GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs"
     GLUSTER_LD_LIBRARY_PATH="$out/lib"
 
@@ -180,7 +180,7 @@ in stdenv.mkDerivation rec {
     rm -r $out/bin/conf.py
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Distributed storage system";
     homepage = "https://www.gluster.org";
     license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2