Merge pull request #235334 from aidalgol/heroic-2.8
heroic: 2.7.1 -> 2.8.0
This commit is contained in:
commit
8d880aa809
@ -10,14 +10,14 @@
|
|||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "gogdl";
|
pname = "gogdl";
|
||||||
version = "0.7.1";
|
version = "0.7.2";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Heroic-Games-Launcher";
|
owner = "Heroic-Games-Launcher";
|
||||||
repo = "heroic-gogdl";
|
repo = "heroic-gogdl";
|
||||||
rev = "8bfb965090153c946c616bb0f82e3dc432e0d0e1";
|
rev = "d7f29dfef5818e8b323d04761e18a9abb750f93e";
|
||||||
sha256 = "sha256-ZdPyJk4WPVBtKMTf/AHNpG8QTV2qmpD1DT1D3gK5g2I=";
|
hash = "sha256-9dAenawt9h/sz5paVYoqk+nmzPrInlqyh1EgshI25CE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -2,8 +2,6 @@
|
|||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchYarnDeps
|
, fetchYarnDeps
|
||||||
, fetchpatch
|
|
||||||
, gitUpdater
|
|
||||||
, yarn
|
, yarn
|
||||||
, fixup_yarn_lock
|
, fixup_yarn_lock
|
||||||
, nodejs
|
, nodejs
|
||||||
@ -17,29 +15,20 @@
|
|||||||
let appName = "heroic";
|
let appName = "heroic";
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "heroic-unwrapped";
|
pname = "heroic-unwrapped";
|
||||||
version = "2.7.1";
|
version = "2.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Heroic-Games-Launcher";
|
owner = "Heroic-Games-Launcher";
|
||||||
repo = "HeroicGamesLauncher";
|
repo = "HeroicGamesLauncher";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-l2eVLn1N+1nGxr8Oa2ecQgBmO0w/VJ8AY06GYQ0HiiI=";
|
hash = "sha256-AZwJRBkWuzBPT+ADVHabiK2KRXe6clZFa0IO99BO2Wk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
offlineCache = fetchYarnDeps {
|
offlineCache = fetchYarnDeps {
|
||||||
yarnLock = "${src}/yarn.lock";
|
yarnLock = "${src}/yarn.lock";
|
||||||
sha256 = "sha256-R0lZrVfUH8NucuwarcE47jQ8ex5FY2hK6jJJ2TIRSWY=";
|
hash = "sha256-xiLK0D9+oL2UMD7b/9htOQJEpYCNayKW+KJ/vNVCgsw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix for capturing keyboard shortcuts when not in focus.
|
|
||||||
# TODO: Remove when updating past 2.7.1.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/commit/c82e6ca8dd7070071793fe5a3c4c04b4ae02c3c7.patch";
|
|
||||||
hash = "sha256-Pum67YPejfq8ERv6XWVLQzs+/SyNojmTGTQpE0UR4kg=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
yarn
|
yarn
|
||||||
fixup_yarn_lock
|
fixup_yarn_lock
|
||||||
@ -102,10 +91,6 @@ in stdenv.mkDerivation rec {
|
|||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.updateScript = gitUpdater {
|
|
||||||
rev-prefix = "v";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac";
|
description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac";
|
||||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||||
|
Loading…
Reference in New Issue
Block a user