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: 8b44c1fe0421
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4cb3041e49cb
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 9, 2020

  1. blender: switch to OpenJPEG 2.x

    Fixes:
    
    -- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)
    
    and
    
      - WITH_IMAGE_OPENJPEG         OFF
    veprbl committed Jan 9, 2020
    Copy the full SHA
    e57392d View commit details
    Browse the repository at this point in the history
  2. openimageio: enable on darwin

    veprbl committed Jan 9, 2020
    Copy the full SHA
    95b8c85 View commit details
    Browse the repository at this point in the history
  3. blender: fix on darwin

    This enables building of Blender.app. The standard build process assumes
    that the dependencies are installed in subdirectoris inside $LIBDIR with
    libraries built as static. In current implementation we are not looking
    to achieve portability, so cmake files are patched to link dynamically
    with the libraries in the nix store. Linking to the transitive
    dependencies is not needed in the shared case. There are also some minor
    inconsistensies in the expected paths, which also need to be patched.
    
    Alternatively, we could patch cmake files to treat darwin as "unix", but
    that would require more tweaking to ensure that the frameworks are being
    linked properly.
    veprbl committed Jan 9, 2020
    Copy the full SHA
    2287d54 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. Copy the full SHA
    8aa0e2f View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. Merge pull request #77359 from veprbl/pr/blender_darwin_fix

    blender: fix on darwin
    veprbl committed Jan 15, 2020
    Copy the full SHA
    4cb3041 View commit details
    Browse the repository at this point in the history