pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apr-1.7.0";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
|
||||
patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
|
||||
|
||||
# This test needs the net
|
||||
postPatch = ''
|
||||
@@ -23,22 +23,22 @@ stdenv.mkDerivation rec {
|
||||
configureFlagsArray+=("--with-installbuilddir=$dev/share/build")
|
||||
'';
|
||||
|
||||
configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"ac_cv_file__dev_zero=yes"
|
||||
"ac_cv_func_setpgrp_void=0"
|
||||
"apr_cv_process_shared_works=1"
|
||||
"apr_cv_tcp_nodelay_with_cork=1"
|
||||
] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
|
||||
# Including the Windows headers breaks unistd.h.
|
||||
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
|
||||
"ac_cv_header_windows_h=no"
|
||||
];
|
||||
|
||||
CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
|
||||
CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "http://apr.apache.org/";
|
||||
description = "The Apache Portable Runtime library";
|
||||
platforms = platforms.all;
|
||||
|
||||
Reference in New Issue
Block a user