pyrox.dev
lol
Merge pull request #128997 from OPNA2608/fix/expat-cmake-files/21.11
expat: Fix cmake config files
authored by
Dmitry Kalinkin
and committed by
GitHub
29aeda33
2899da3a
+7
pkgs/development/libraries/expat/default.nix
+7
pkgs/development/libraries/expat/default.nix
···
27
27
patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh
28
28
'';
29
29
30
+
# CMake files incorrectly calculate library path from dev prefix
31
+
# https://github.com/libexpat/libexpat/issues/501
32
+
postFixup = ''
33
+
substituteInPlace $dev/lib/cmake/expat-${version}/expat-noconfig.cmake \
34
+
--replace "$"'{_IMPORT_PREFIX}' $out
35
+
'';
36
+
30
37
meta = with lib; {
31
38
homepage = "https://libexpat.github.io/";
32
39
description = "A stream-oriented XML parser library written in C";
+3
-3
pkgs/development/libraries/opencolorio/default.nix
+3
-3
pkgs/development/libraries/opencolorio/default.nix
···
1
1
{
2
-
stdenv, lib, fetchFromGitHub, symlinkJoin,
2
+
stdenv, lib, fetchFromGitHub,
3
3
cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies
4
4
5
5
glew, freeglut, # Only required on Linux
···
25
25
sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487";
26
26
};
27
27
28
-
nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ];
29
-
buildInputs = [ expat.out libyamlcpp ilmbase pystring ]
28
+
nativeBuildInputs = [ cmake ];
29
+
buildInputs = [ expat libyamlcpp ilmbase pystring ]
30
30
++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
31
31
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
32
32
++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]