public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added optional unicode support to pcre. Building old (non-unicode) package by

Browse Source 
default.

svn path=/nixpkgs/trunk/; revision=9386
This commit is contained in:
Yury G. Kudryashov 2007-10-01 15:07:55 +00:00
parent 1994bd5b6a
commit 82b608d93f
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/pcre/default.nix
View File

@ -1,9 +1,14 @@
{stdenv, fetchurl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "pcre-7.1"; name = "pcre-7.1";
src = fetchurl { src = fetchurl {
url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.1.tar.bz2; url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.1.tar.bz2;
sha256 = "0rpkcw07jas3fw6ava3ni5zcrmbncwa8xlsa0lzq6z2iph5510li"; sha256 = "0rpkcw07jas3fw6ava3ni5zcrmbncwa8xlsa0lzq6z2iph5510li";
}; };
} }
// (if unicodeSupport then
{
configureFlags = "--enable-unicode-properties --enable-shared --disable-static";
}
else {}))

6
pkgs/top-level/all-packages.nix
View File

@ -146,6 +146,11 @@ rec {
getVersion = name: alts: builtins.getAttr getVersion = name: alts: builtins.getAttr
(getConfig [ "environment" "versions" name ] "default") alts; (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 # The contents of the configuration file found at $NIXPKGS_CONFIG or
# $HOME/.nixpkgs/config.nix. # $HOME/.nixpkgs/config.nix.
config = config =
@ -1930,6 +1935,7 @@ rec {
pcre = import ../development/libraries/pcre { pcre = import ../development/libraries/pcre {
inherit fetchurl stdenv; inherit fetchurl stdenv;
unicodeSupport = getFlag "unicode" "pcre" false;
}; };
popt = import ../development/libraries/popt { popt = import ../development/libraries/popt {