diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-10 12:18:02 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-10 12:18:02 +0200 |
| commit | 5a330ad3064bec988c29da0aaf706b23ac413c29 (patch) | |
| tree | 7b700c56017ca69f171ad1bb59387cfa658093b8 /pkgs | |
| parent | 90ee28091313d684177fae15f2ca18c83b84f3ea (diff) | |
| parent | 086e801d5132bcf9a4e4cac56c361651b7b22ac0 (diff) | |
| download | nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar.gz nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar.bz2 nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar.lz nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar.xz nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.tar.zst nixpkgs-5a330ad3064bec988c29da0aaf706b23ac413c29.zip | |
Merge pull request #7724 from berdario/python-wide-builds
Enable old pythons' wide builds
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/3.2/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 9bf161ffc1a..ffc4c5d2e1f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -63,7 +63,7 @@ let C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode"; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 8b24fe00463..b8b25c576c5 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -79,7 +79,7 @@ let C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode"; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 2645b503344..f4103662316 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { done ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - configureFlagsArray=( --enable-shared --with-threads + configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" |