Unverified Commit 7fcf4d63 authored by Marcin Serwin's avatar Marcin Serwin
Browse files

pcsx2: patch git tag instead of git rev 



Signed-off-by: default avatarMarcin Serwin <marcin@serwin.dev>
parent ce9450fb

pkgs/by-name/pc/pcsx2/0000-define-rev.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake

index 87f012c..052f1be 100644

--- a/cmake/Pcsx2Utils.cmake

+++ b/cmake/Pcsx2Utils.cmake

@@ -44,7 +44,6 @@ function(detect_compiler)

 endfunction()

 

 function(get_git_version_info)

-	set(PCSX2_GIT_REV "")

 	set(PCSX2_GIT_TAG "")

 	set(PCSX2_GIT_HASH "")

 	if (GIT_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.git)

pkgs/by-name/pc/pcsx2/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -59,17 +59,18 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { 
  };



  patches = [

    # Remove PCSX2_GIT_REV

    ./0000-define-rev.patch



    ./remove-cubeb-vendor.patch

  ];



  postPatch = ''

    substituteInPlace cmake/Pcsx2Utils.cmake \

      --replace-fail 'set(PCSX2_GIT_TAG "")' 'set(PCSX2_GIT_TAG "${finalAttrs.src.tag}")'

  '';



  cmakeFlags = [

    (lib.cmakeBool "PACKAGE_MODE" true)

    (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true)

    (lib.cmakeBool "USE_LINKED_FFMPEG" true)

    (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.tag)

  ];



  nativeBuildInputs = [