diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-12-10 15:24:30 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-12-10 15:24:30 +0000 |
commit | dd604d575f59c771965d6d5d4707505ea7374012 (patch) | |
tree | bc9a34d5a9c3843140f23d9366db7352a345a4e1 /pkgs/development/interpreters | |
parent | 926aaa48702a1a18c1179b72a8832f25842401ca (diff) | |
parent | b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb (diff) | |
download | nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.gz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.bz2 nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.lz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.xz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.zst nixlib-dd604d575f59c771965d6d5d4707505ea7374012.zip |
Merge branch 'master' into staging
* master: (39 commits) pythonPackages: rename dns -> dnspython awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5] qt4: fix qmake on darwin and delete custom install phase python.buildEnv: always include the $out output nix-bash-completions: lazy load aware install borg: 1.1.1 -> 1.1.3 nixos/programs/bash: document that /etc/bash_completion.d is obsolete ocamlPackages.markup: 0.7.4 -> 0.7.5 hhvm: 3.21 -> 3.23.2 ocamlPackages.ulex: 1.1 -> 1.2 notmuch: 0.25.2 -> 0.25.3 gmime3: 3.0.1 -> 3.0.5 qt4: fix darwin install phase nixos/programs/bash: Let bash-completion lazy load scripts Revert "gmime: 3.0.1 -> 3.0.5" rawtherapee: delete unused files pythonPackages: rename dns -> dnspython nixpkgs: remove sqlite/kyotocabinet deps for leveldb tor-browser-bundle-bin: 7.0.10 -> 7.0.11 networkmanager: remove restart after suspend from resume ...
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index b28df2501aac..9352bb4d52e0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -201,7 +201,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; executable = libPrefix; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index fc521828ffc4..8d4e68bf57ca 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -14,7 +14,8 @@ let name = "${python.name}-env"; inherit paths; - inherit ignoreCollisions extraOutputsToInstall; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" |