From 5beee0879dcc999d2c165170a894255e3af69956 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 3 Jul 2024 22:51:19 -0300 Subject: [PATCH] emulationstation: get rid of fetchSubmodules Mental note: I need to automate this! --- pkgs/by-name/em/emulationstation/package.nix | 7 +++++++ pkgs/by-name/em/emulationstation/sources.nix | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix index 391a844cf0e32d9..dae4d28f6932ca9 100644 --- a/pkgs/by-name/em/emulationstation/package.nix +++ b/pkgs/by-name/em/emulationstation/package.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation (finalAttrs: { inherit (sources.emulationstation) pname version src; + postUnpack = '' + pushd $sourceRoot/external/pugixml + cp -va ${sources.pugixml.src}/* . + chmod --recursive 744 . + popd + ''; + nativeBuildInputs = [ SDL2 cmake diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix index e73601cff73e3e3..ca15e296f4d252c 100644 --- a/pkgs/by-name/em/emulationstation/sources.nix +++ b/pkgs/by-name/em/emulationstation/sources.nix @@ -12,8 +12,22 @@ owner = "RetroPie"; repo = "EmulationStation"; rev = "v${self.version}"; - fetchSubmodules = true; - hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ="; + hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE="; + }; + }; + in + self; + + pugixml = let + self = { + pname = "pugixml"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "zeux"; + repo = "pugixml"; + rev = "v${self.version}"; + hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4="; }; }; in