Skip to content

cmake: classify libraries in /usr/lib as system libraries #98565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hannesweisbach wants to merge 2 commits into from
Closed

cmake: classify libraries in /usr/lib as system libraries #98565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85ad18
cimg: 2.9.1 -> 2.9.2
AndersonTorres Sep 22, 2020
05d5967
cmake: classify libraries in /usr/lib as system libraries
hannesweisbach Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/libraries/cimg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b";
sha256 = "sha256-7v8651yDkxTdRMoGhEl4d/k7mxYwfIwW/rkuyjqVGwY=";
};

installPhase = ''
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/tools/build-managers/cmake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ stdenv.mkDerivation rec {
# CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
+ ''
configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags"
''
# Detect dylibs in /usr/lib as system libraries on Darwin to correctly build App bundles
+ stdenv.lib.optionalString stdenv.isDarwin ''
Copy link
Member

@SuperSandro2000 SuperSandro2000 Jan 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
+ stdenv.lib.optionalString stdenv.isDarwin ''
+ lib.optionalString stdenv.isDarwin ''

As per recent contributing change.

substituteInPlace Modules/GetPrerequisites.cmake --replace \
"if(resolved_file MATCHES \"^(/System/Library/|/var/empty/lib/)\")" \
"if(resolved_file MATCHES \"^(/System/Library/|/usr/lib/)\")"
'';

configureFlags = [
Expand Down