nanoboyadvance: use cmake flag instead of patch for glad source

This commit is contained in:
TomaSajt 2024-09-21 23:43:12 +02:00
parent 223f611353
commit 963b72c000
No known key found for this signature in database
GPG Key ID: F011163C050122A1
2 changed files with 9 additions and 27 deletions

View File

@ -1,14 +0,0 @@
diff --git a/src/platform/core/CMakeLists.txt b/src/platform/core/CMakeLists.txt
index 2bc6d8c..3175c14 100644
--- a/src/platform/core/CMakeLists.txt
+++ b/src/platform/core/CMakeLists.txt
@@ -18,8 +18,7 @@ find_package(OpenGL REQUIRED)
include(FetchContent)
FetchContent_Declare(glad
- GIT_REPOSITORY https://github.com/Dav1dde/glad.git
- GIT_TAG adc3d7a1d704e099581ca25bc5bbdf728c2db67b # v2.0.5-2-gadc3d7a
+ SOURCE_DIR @gladSrc@
SOURCE_SUBDIR cmake
)
FetchContent_MakeAvailable(glad)

View File

@ -2,7 +2,6 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
substituteAll,
cmake, cmake,
python3Packages, python3Packages,
libsForQt5, libsForQt5,
@ -12,6 +11,14 @@
libunarr, libunarr,
}: }:
let
gladSrc = fetchFromGitHub {
owner = "Dav1dde";
repo = "glad";
rev = "v2.0.5";
hash = "sha256-Ba7nbd0DxDHfNXXu9DLfnxTQTiJIQYSES9CP5Bfq4K0=";
};
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "nanoboyadvance"; pname = "nanoboyadvance";
version = "1.8.1"; version = "1.8.1";
@ -23,18 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-du3dPTg3OxNTWXDQo2m9W0rJxtrkn+lQSh/XGiu/eGg="; hash = "sha256-du3dPTg3OxNTWXDQo2m9W0rJxtrkn+lQSh/XGiu/eGg=";
}; };
patches = [
(substituteAll {
src = ./dont-fetch-glad.patch;
gladSrc = fetchFromGitHub {
owner = "Dav1dde";
repo = "glad";
rev = "v2.0.5";
hash = "sha256-Ba7nbd0DxDHfNXXu9DLfnxTQTiJIQYSES9CP5Bfq4K0=";
};
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
python3Packages.jinja2 python3Packages.jinja2
@ -50,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLAD" "${gladSrc}")
(lib.cmakeBool "USE_SYSTEM_FMT" true) (lib.cmakeBool "USE_SYSTEM_FMT" true)
(lib.cmakeBool "USE_SYSTEM_TOML11" true) (lib.cmakeBool "USE_SYSTEM_TOML11" true)
(lib.cmakeBool "USE_SYSTEM_UNARR" true) (lib.cmakeBool "USE_SYSTEM_UNARR" true)