mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
openxray: 2188-november-2023-rc1 -> 2921-january-2025-rc1
This commit is contained in:
parent
9ab2bf3135
commit
925e96bb23
1 changed files with 20 additions and 3 deletions
|
@ -18,16 +18,23 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "openxray";
|
pname = "openxray";
|
||||||
version = "2188-november-2023-rc1";
|
version = "2921-january-2025-rc1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenXRay";
|
owner = "OpenXRay";
|
||||||
repo = "xray-16";
|
repo = "xray-16";
|
||||||
rev = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-rRxw/uThACmT2qI8NUwJU+WbJ3BWUss6CH13R5aaHco=";
|
hash = "sha256-PYRC1t4gjT2d41ZZOZJF4u3vc0Pq7DpivEnnfbcSQYk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Don't force-override these please
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace Externals/LuaJIT-proj/CMakeLists.txt \
|
||||||
|
--replace-fail 'set(CMAKE_OSX_SYSROOT' '#set(CMAKE_OSX_SYSROOT' \
|
||||||
|
--replace-fail 'set(ENV{SDKROOT}' '#set(ENV{SDKROOT}'
|
||||||
|
'';
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -47,6 +54,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pcre
|
pcre
|
||||||
];
|
];
|
||||||
|
|
||||||
|
cmakeFlags =
|
||||||
|
[
|
||||||
|
# Breaks on Darwin
|
||||||
|
(lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin))
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
# This seemingly only gets set properly by CMake when using the XCode generator
|
||||||
|
(lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}")
|
||||||
|
];
|
||||||
|
|
||||||
# Crashes can happen, we'd like them to be reasonably debuggable
|
# Crashes can happen, we'd like them to be reasonably debuggable
|
||||||
cmakeBuildType = "RelWithDebInfo";
|
cmakeBuildType = "RelWithDebInfo";
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue