Skip to content

Commit

Permalink
cmake: clean up obsolete Darwin patches (#373535)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilazy authored Jan 26, 2025
2 parents ff2e018 + 2df17d7 commit b1a0192
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 102 deletions.
39 changes: 0 additions & 39 deletions pkgs/by-name/cm/cmake/002-application-services.diff

This file was deleted.

55 changes: 0 additions & 55 deletions pkgs/by-name/cm/cmake/003-libuv-application-services.diff

This file was deleted.

8 changes: 0 additions & 8 deletions pkgs/by-name/cm/cmake/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
./000-nixpkgs-cmake-prefix-path.diff
# Don't search in non-Nix locations such as /usr, but do search in our libc.
./001-search-path.diff
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# TODO: Remove these in `staging`.

# Don't depend on frameworks.
./002-application-services.diff
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./003-libuv-application-services.diff
]
++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff
# Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51
# On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
# On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
Expand Down

0 comments on commit b1a0192

Please sign in to comment.