Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 07cebeffb886
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9925e909e477
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 3, 2020

  1. gimp: Fix interpreter path 

    GIMP uses python interpreter specified in pygimp.interp file for running Python plug-ins,
so any Python related wrapping is useless. It will pick up and use the python from build PATH.

Let’s use a python environment containing pygtk, which is needed by many plug-ins.

Closes: #87883
    @jtojnar
    jtojnar committed Jul 3, 2020
    Copy the full SHA
    3b701aa View commit details
    Browse the repository at this point in the history

  2. gimp: Hardcode interpreter paths 

    The E (extension) line in pygimp.interp prints the following warnings:

GIMP-Warning: Bad interpreter referenced in interpreter file /nix/store/5c91dah385gn70blsn6i5rzncqj3ks0y-gimp-with-plugins-2.10.18/lib/gimp/2.0/interpreters/pygimp.interp: python2
GIMP-Warning: Bad binary format string in interpreter file /nix/store/5c91dah385gn70blsn6i5rzncqj3ks0y-gimp-with-plugins-2.10.18/lib/gimp/2.0/interpreters/pygimp.interp

This means that the py extension will not be registered when python2 is not in PATH. To prevent this, let’s hardcode the absolute python2 path.

#60937 (comment)

Closes: #60937
    @jtojnar
    jtojnar committed Jul 3, 2020
    Copy the full SHA
    64ec4fd View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. Merge pull request #92228 from jtojnar/gimp-interp

    @jtojnar
    jtojnar committed Jul 5, 2020
    Copy the full SHA
    9925e90 View commit details
    Browse the repository at this point in the history