diff options
| author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2023-11-05 11:23:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 11:23:43 +0900 |
| commit | c2088a45896220dffcebaecd2f7b4ae3db48309b (patch) | |
| tree | 3e54020f576a4264a4a7a21abd8a12898a6b500e | |
| parent | b6ba8de16fed017006ddd6fe43d19bfacb2cc94f (diff) | |
| parent | ccb9b5d39485028fdbbe64b1d63dcdaff9afda4a (diff) | |
| download | nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar.gz nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar.bz2 nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar.lz nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar.xz nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.tar.zst nixpkgs-c2088a45896220dffcebaecd2f7b4ae3db48309b.zip | |
Merge pull request #265493 from wegank/jxrlib-clang-16
jxrlib: fix build with clang 16
| -rw-r--r-- | pkgs/development/libraries/jxrlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/mahotas/default.nix | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa5..517746aa9b5 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index fa711c1b4cc..2f234cc6354 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; + # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c++14"; + }; + # tests must be run in the build directory preCheck = '' cd build/lib* |