mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Added optional unicode support to pcre. Building old (non-unicode) package by
default. svn path=/nixpkgs/trunk/; revision=9386
This commit is contained in:
parent
1994bd5b6a
commit
82b608d93f
@ -1,9 +1,14 @@
|
||||
{stdenv, fetchurl}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation ({
|
||||
name = "pcre-7.1";
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.1.tar.bz2;
|
||||
sha256 = "0rpkcw07jas3fw6ava3ni5zcrmbncwa8xlsa0lzq6z2iph5510li";
|
||||
};
|
||||
}
|
||||
// (if unicodeSupport then
|
||||
{
|
||||
configureFlags = "--enable-unicode-properties --enable-shared --disable-static";
|
||||
}
|
||||
else {}))
|
||||
|
@ -146,6 +146,11 @@ rec {
|
||||
getVersion = name: alts: builtins.getAttr
|
||||
(getConfig [ "environment" "versions" name ] "default") alts;
|
||||
|
||||
# Whether user enabled given feature for the given package?
|
||||
getFlag = flag: package: default:
|
||||
getConfig [ "environment" "flags" package flag ]
|
||||
(getConfig [ "environment" "flags" "default" flag ] default);
|
||||
|
||||
# The contents of the configuration file found at $NIXPKGS_CONFIG or
|
||||
# $HOME/.nixpkgs/config.nix.
|
||||
config =
|
||||
@ -1930,6 +1935,7 @@ rec {
|
||||
|
||||
pcre = import ../development/libraries/pcre {
|
||||
inherit fetchurl stdenv;
|
||||
unicodeSupport = getFlag "unicode" "pcre" false;
|
||||
};
|
||||
|
||||
popt = import ../development/libraries/popt {
|
||||
|
Loading…
Reference in New Issue
Block a user