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: a10cd24ab047
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b4ea9a45acb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 16, 2020

  1. jxrlib: fix/enable for darwin

    @risicle
    risicle committed Aug 16, 2020
    Copy the full SHA
    1bee13e View commit details

Commits on Sep 5, 2020

  1. Merge pull request #95625 from risicle/ris-jxrlib-darwin 

    jxrlib: fix/enable for darwin
    @risicle
    risicle authored Sep 5, 2020
    Copy the full SHA
    9b4ea9a View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/development/libraries/jxrlib/default.nix
8 changes: 7 additions & 1 deletion pkgs/development/libraries/jxrlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
};

postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace '-shared' '-dynamiclib -undefined dynamic_lookup' \
--replace '.so' '.dylib'
'';

nativeBuildInputs = [ python ];

makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
@@ -21,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Implementation of the JPEG XR image codec standard";
homepage = "https://jxrlib.codeplex.com";
license = licenses.bsd2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ romildo ];
};
}