Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

geis: fix python programs #34036

Merged
merged 1 commit into from Feb 18, 2018
Merged

Conversation

jraygauthier
Copy link
Member

@jraygauthier jraygauthier commented Jan 19, 2018

Motivation for this change

Non working python programs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Also ran the only dependent program /szhw3miyaqfxsw2lwkrsz4qdp03hd7vz-touchegg-1.1.1/bin/touchegg successfully.

@grahamc
Copy link
Member

grahamc commented Jan 20, 2018

@GrahamcOfBorg build geis

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/lib/python3.6/site-packages/_geis_bindings.so
shrinking /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/lib/libgeis.so.1.3.0
gzipping man pages under /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/share/man/
strip is /nix/store/jwz859pxqj7sl2dbwvmxkx68jp774izb-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/lib  /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/bin
patching script interpreter paths in /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17
/nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/bin/.pygeis-wrapped: interpreter directive changed from "/usr/bin/python3" to "/nix/store/mn2c28fa7mp8ck3p74n80nls6g2w7flw-python3-3.6.4/bin/python3"
/nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17/bin/.geisview-wrapped: interpreter directive changed from "/usr/bin/python3" to "/nix/store/mn2c28fa7mp8ck3p74n80nls6g2w7flw-python3-3.6.4/bin/python3"
checking for references to /build in /nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17...
/nix/store/4vq8bbgkpgzcsdww4344sr2fslpzz2sp-geis-2.2.17

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/lib/python3.6/site-packages/_geis_bindings.so
shrinking /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/bin/.geistest-wrapped
gzipping man pages under /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/share/man/
strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/lib  /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/bin 
patching script interpreter paths in /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17
/nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/bin/.geisview-wrapped: interpreter directive changed from "/usr/bin/python3" to "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/bin/python3"
/nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17/bin/.pygeis-wrapped: interpreter directive changed from "/usr/bin/python3" to "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/bin/python3"
checking for references to /tmp/nix-build-geis-2.2.17.drv-0 in /nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17...
/nix/store/fwavwag77a2526316xldjxq62vvrnyl3-geis-2.2.17

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

Package ‘geis-2.2.17’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/development/libraries/geis/default.nix:49 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
Copy link
Member

Choose a reason for hiding this comment

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

Have you tried with --set first? --prefix should be avoided as an existing PYTHONPATH may leak in.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$out/lib")
Copy link
Member

Choose a reason for hiding this comment

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

Patching the code to hardcode a path to the required libraries is the preferred solution.

Copy link
Member Author

Choose a reason for hiding this comment

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

@FRidh: applied suggested changes to PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@FRidh FRidh merged commit dca3146 into NixOS:master Feb 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants