From 60c4759306c6ea78bf848edcb20fbe2f50cbc0cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 27 Oct 2022 23:20:00 -0500 Subject: physfs_2: 2.0.3 -> 2.1.1 --- pkgs/development/libraries/physfs/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index faa338c94fc..0b47ea5c12c 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -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; @@ -35,6 +33,6 @@ let }; in { - physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; + physfs_2 = generic "2.1.1" "sha256-hmS/bfszit3kD6B2BjnuV50XKueq2GcRaqyAKLkvfLc="; physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b113c58f381..816f8581f5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21571,7 +21571,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; -- cgit 1.4.1