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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d78e0c7f585b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7679b8edae18
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 28, 2020

  1. openexr,ilmbase: Switch to cmake-based build 

    It appears that the autotools based build isn't supported on Darwin.
Just use the stdenv-builtin cmake build everywhere, as it works just
fine and is simpler.
    @glittershark
    glittershark committed Apr 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f509255 View commit details

Commits on Apr 29, 2020

  1. Merge pull request #86241 from glittershark/openexr-cmake 

    openexr: Switch to cmake-based build
    @worldofpeace
    worldofpeace authored Apr 29, 2020
    Copy the full SHA
    7679b8e View commit details
Showing with 20 additions and 48 deletions.
  1. +9 −14 pkgs/development/libraries/ilmbase/default.nix
  2. +11 −34 pkgs/development/libraries/openexr/default.nix
23 changes: 9 additions & 14 deletions pkgs/development/libraries/ilmbase/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{ stdenv, lib, buildPackages, automake, autoconf, libtool, which,
fetchpatch, openexr }:
{ stdenv
, buildPackages
, cmake
, libtool
, openexr
}:

stdenv.mkDerivation rec {
pname = "ilmbase";
version = lib.getVersion openexr;
version = stdenv.lib.getVersion openexr;

# the project no longer provides separate tarballs. We may even want to merge
# the ilmbase package into openexr in the future.
@@ -13,19 +17,10 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" ];

preConfigure = ''
patchShebangs ./bootstrap
./bootstrap
'';

nativeBuildInputs = [ cmake libtool ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ automake autoconf libtool which ];

NIX_CFLAGS_LINK = "-pthread";

patches = [
./cross.patch
];
patches = [ ./cross.patch ];

# fails 1 out of 1 tests with
# "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
45 changes: 11 additions & 34 deletions pkgs/development/libraries/openexr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig,
zlib, ilmbase, fetchpatch }:

let
# Doesn't really do anything when not crosscompiling
emulator = stdenv.hostPlatform.emulator buildPackages;
in

{ lib
, stdenv
, buildPackages
, fetchFromGitHub
, zlib
, ilmbase
, fetchpatch
, cmake
, libtool
}:
stdenv.mkDerivation rec {
pname = "openexr";
version = "2.4.1";
@@ -17,36 +19,11 @@ stdenv.mkDerivation rec {
sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01";
};

sourceRoot = "source/OpenEXR";

outputs = [ "bin" "dev" "out" "doc" ];

# Needed because there are some generated sources. Solution: just run them under QEMU.
postPatch = ''
for file in b44ExpLogTable dwaLookups
do
# Ecape for both sh and Automake
emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)}
before="./$file > $file.h"
after="$emu $before"
substituteInPlace IlmImf/Makefile.am \
--replace "$before" "$after"
done
# Make sure the patch succeeded
[[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]]
'';

preConfigure = ''
patchShebangs ./bootstrap
./bootstrap
'';

nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
nativeBuildInputs = [ cmake libtool ];
propagatedBuildInputs = [ ilmbase zlib ];

enableParallelBuilding = true;
doCheck = false; # fails 1 of 1 tests

meta = with stdenv.lib; {
description = "A high dynamic-range (HDR) image file format";