Merge pull request #255537 from aidalgol/heroic-2.9.2
heroic: 2.9.1 -> 2.9.2
This commit is contained in:
commit
9f0e5916c8
|
@ -8,6 +8,7 @@
|
|||
, python3
|
||||
, makeWrapper
|
||||
, electron
|
||||
, vulkan-helper
|
||||
, gogdl
|
||||
, legendary-gl
|
||||
, nile
|
||||
|
@ -16,18 +17,18 @@
|
|||
let appName = "heroic";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1FtAcp6cG2qRfWrAgCOQ87DzMvszqqhObfSzepezBGc=";
|
||||
hash = "sha256-kCvMUhN1kjGb5rV+lkKm1FFYBJUSQGOKTY1DQdiAWLU=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-KEzTjtoBcHNJxC/7W/Bft75JZuZUSHieOOAwhbr5d3s=";
|
||||
hash = "sha256-kHZL7TENVK58dvr8PBFtWYZ2PSKEYESX4e1xYmMA5+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -86,7 +87,8 @@ in stdenv.mkDerivation rec {
|
|||
ln -s \
|
||||
"${gogdl}/bin/gogdl" \
|
||||
"${legendary-gl}/bin/legendary" \
|
||||
"${nile}"/bin/nile \
|
||||
"${nile}/bin/nile" \
|
||||
"${lib.optionalString stdenv.isLinux "${vulkan-helper}/bin/vulkan-helper"}" \
|
||||
"$out/share/${appName}/build/bin/${binPlatform}"
|
||||
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
|
||||
|
|
37
pkgs/tools/graphics/vulkan-helper/default.nix
Normal file
37
pkgs/tools/graphics/vulkan-helper/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, vulkan-loader
|
||||
, addOpenGLRunpath
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vulkan-helper";
|
||||
version = "unstable-2023-09-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imLinguin";
|
||||
repo = "vulkan-helper-rs";
|
||||
rev = "d65b1a17a11ec20670c77d8da02e68d388ed0888";
|
||||
hash = "sha256-usbYNalA0r09LXR6eV2e/T1eMNV4LnhzYLzPJQ6XNKQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-s5QytuNhjZQhIDJtpeAW3J4op1t4nC+xD2i7Zf5mzfw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
patchelf --add-rpath ${vulkan-loader}/lib $out/bin/vulkan-helper
|
||||
addOpenGLRunpath $out/bin/vulkan-helper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple CLI app used to interface with basic Vulkan APIs";
|
||||
homepage = "https://github.com/imLinguin/vulkan-helper-rs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -25708,6 +25708,8 @@ with pkgs;
|
|||
|
||||
vulkan-cts = callPackage ../tools/graphics/vulkan-cts { };
|
||||
|
||||
vulkan-helper = callPackage ../tools/graphics/vulkan-helper { };
|
||||
|
||||
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
|
||||
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
|
||||
vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; };
|
||||
|
|
Loading…
Reference in a new issue