push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,62 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
doxygen,
zlib,
}:
let
generic =
version: sha256:
stdenv.mkDerivation rec {
pname = "physfs";
inherit version;
src = fetchFromGitHub {
owner = "icculus";
repo = "physfs";
rev = "release-${version}";
inherit sha256;
};
patches = [
(./. + "/dont-set-cmake-skip-rpath-${version}.patch")
];
# https://github.com/icculus/physfs/commit/f7d24ce8486d9229207cca1ff98858fe60ffe583
# but the patch wouldn't apply to physfs_2, so let's do a fuzzy sed.
postPatch = ''
sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' \
-i CMakeLists.txt
'';
nativeBuildInputs = [
cmake
doxygen
];
buildInputs = [ zlib ];
doInstallCheck = true;
installCheckPhase = ''
./test_physfs --version
'';
meta = with lib; {
homepage = "https://icculus.org/physfs/";
description = "Library to provide abstract access to various archives";
mainProgram = "test_physfs";
changelog = "https://github.com/icculus/physfs/releases/tag/release-${version}";
license = licenses.zlib;
platforms = platforms.all;
};
};
in
{
physfs_2 = generic "2.1.1" "sha256-hmS/bfszit3kD6B2BjnuV50XKueq2GcRaqyAKLkvfLc=";
physfs = generic "3.2.0" "sha256-FhFIshX7G3uHEzvHGlDIrXa7Ux6ThQNzVssaENs+JMw=";
}

View File

@@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4ef61e..7b2f26c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,11 +29,6 @@ if(APPLE)
set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
endif()
-if(CMAKE_COMPILER_IS_GNUCC)
- # Don't use -rpath.
- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
-endif()
-
if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT)
add_definitions(-xldscope=hidden)

View File

@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3291cc..11e7ad1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,6 @@ endif()
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall)
- # Don't use -rpath.
- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")