Merge pull request #335276 from qubitnano/ship806

shipwright: 8.0.5 -> 8.0.6
This commit is contained in:
Nick Cao 2024-08-17 14:11:59 -04:00 committed by GitHub
commit 2ac1bb462c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "shipwright";
version = "8.0.5";
version = "8.0.6";
src = fetchFromGitHub {
owner = "harbourmasters";
repo = "shipwright";
rev = finalAttrs.version;
hash = "sha256-o2VwOF46Iq4pwpumOau3bDXJ/CArx6NWBi00s3E4PnE=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ=";
fetchSubmodules = true;
};
@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736
gamecontrollerdb = fetchurl {
name = "gamecontrollerdb.txt";
url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b7933e43ca2f8d26d8b668ea8ea52b736221af1e/gamecontrollerdb.txt";
hash = "sha256-XIuS9BkWkM9d+SgT1OYTfWtcmzqSUDbMrMLoVnPgidE=";
url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/075c1549075ef89a397fd7e0663d21e53a2485fd/gamecontrollerdb.txt";
hash = "sha256-atjc0t921l6JSUAd/Yk7uup2R7mCp5ivAh6Dr7HBY7I=";
};
nativeBuildInputs = [
@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib"
(lib.cmakeBool "NON_PORTABLE" true)
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
];
env.NIX_CFLAGS_COMPILE =