diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/serf/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/serf/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/serf/default.nix b/nixpkgs/pkgs/development/libraries/serf/default.nix index 92dde2111fc8..dbdc9ce28714 100644 --- a/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/nixpkgs/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos -, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos +, pkg-config, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) kerberos; patches = [ ./scons.patch ]; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sconsFlags+=" CC=$CC" sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" - '' + stdenv.lib.optionalString (!stdenv.isCygwin) '' + '' + lib.optionalString (!stdenv.isCygwin) '' sconsFlags+=" GSSAPI=${kerberos.dev}" ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP client library based on APR"; license = licenses.asl20; maintainers = with maintainers; [ orivej raskin ]; |