Skip to content

Commit

Permalink
mkPythonDerivation: append postFixup, fixes #9204
Browse files Browse the repository at this point in the history
  • Loading branch information
@FRidh
FRidh committed Oct 26, 2016
1 parent de38602 commit 85a87f5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/mk-python-derivation.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
doCheck = false;
doInstallCheck = doCheck;

postFixup = attrs.postFixup or ''
postFixup = ''
wrapPythonPrograms
'' + lib.optionalString catchConflicts ''
# check if we have two packages with the same name in closure and fail
# this shouldn't happen, something went wrong with dependencies specs
${python.interpreter} ${./catch_conflicts.py}
'';
'' + attrs.postFixup or '''';

passthru = {
inherit python; # The python interpreter
Expand Down

5 comments on commit 85a87f5

@risicle
Copy link
Contributor

@risicle risicle commented on 85a87f5 May 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FRidh on #3134 we're tracking down why django packages are getting their project templates wrapPythonPrograms-wrapped again when that was fixed a while ago. A git bisect pointed to this being the guilty commit and it makes sense why - following this wrapPythonPrograms gets called unconditionally, whatever the contents of postFixup.

Thoughts on achieving the desired end without this side effect?

@FRidh
Copy link
Member Author

@FRidh FRidh commented on 85a87f5 May 23, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@risicle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm... that seems a little extreme as it will also lose us any interpreter path patching etc.

What would you think about taking a leaf out of mkDerivation's book and obeying a dontWrapPythonPrograms flag (or something) a la dontPatchELF?

@FRidh
Copy link
Member Author

@FRidh FRidh commented on 85a87f5 May 24, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@risicle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool - will do

Please sign in to comment.