colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #198442 from marsam/update-physfs

Browse Source 
physfs: 2.0.3 -> 2.1.1, 3.0.2 -> 3.2.0
This commit is contained in:
Mario Rodas 2022-10-30 11:13:12 -05:00 committed by GitHub
commit 915fd63594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/physfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }:
{ lib, stdenv, fetchFromGitHub, cmake, doxygen, zlib, Foundation }:
let
generic = version: sha256:
@ -6,19 +6,17 @@ let
pname = "physfs";
inherit version;
src = fetchurl {
url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2";
src = fetchFromGitHub {
owner = "icculus";
repo = "physfs";
rev = "release-${version}";
inherit sha256;
};
nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ Foundation Carbon ];
patchPhase = ''
sed s,-Werror,, -i CMakeLists.txt
'';
++ lib.optionals stdenv.isDarwin [ Foundation ];
doInstallCheck = true;
@ -27,14 +25,15 @@ let
'';
meta = with lib; {
homepage = "http://icculus.org/physfs/";
homepage = "https://icculus.org/physfs/";
description = "Library to provide abstract access to various archives";
license = licenses.free;
platforms = platforms.unix;
changelog = "https://github.com/icculus/physfs/releases/tag/release-${version}";
license = licenses.zlib;
platforms = platforms.all;
};
};
in {
physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h";
physfs_2 = generic "2.1.1" "sha256-hmS/bfszit3kD6B2BjnuV50XKueq2GcRaqyAKLkvfLc=";
physfs = generic "3.2.0" "sha256-FhFIshX7G3uHEzvHGlDIrXa7Ux6ThQNzVssaENs+JMw=";
}

2
pkgs/top-level/all-packages.nix
View File

@ -21608,7 +21608,7 @@ with pkgs;
pe-parse = callPackage ../development/libraries/pe-parse { };
inherit (callPackage ../development/libraries/physfs {
inherit (darwin.apple_sdk.frameworks) Foundation Carbon;
inherit (darwin.apple_sdk.frameworks) Foundation;
})
physfs_2
physfs;