Compare commits

..

No commits in common. "main" and "unstable-2025-07-26-3c77bad" have entirely different histories.

4 changed files with 30 additions and 35 deletions

6
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1756266583,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
"lastModified": 1752687322,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"type": "github"
},
"original": {

View file

@ -1,12 +1,12 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
outputs = { nixpkgs, ... }:
outputs = { nixpkgs, ... }:
let
forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
in
in
{
packages = forAllSystems (system: {
packages = forAllSystems (system: {
default = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk.nix { };
lsfg-vk = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk.nix { };
lsfg-vk-ui = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk-ui.nix { };

View file

@ -7,21 +7,21 @@
pango,
gdk-pixbuf,
gtk4,
libadwaita,
libadwaita
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "lsfg-vk-ui";
version = "1.0.0";
version = "0.9.0-2025-07-26-3c77bad";
src = fetchFromGitHub {
owner = "PancakeTAS";
repo = "lsfg-vk";
tag = "v${version}";
hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw=";
rev = "3c77bad7941e2699a797b2741b64b8d907118bb6";
hash = "sha256-ZAtTzdSx81NK2ABSEIDOeYUgJDH4ROMApDSlg8U140k=";
};
cargoHash = "sha256-hIQRS/egIDU5Vu/1KWHtpt4S26h+9GadVr+lBAG2LDg=";
cargoHash = "sha256-1/3CTCXTqSfb/xtx/Q1whaHPeQ0fxu0Zg2sVJPxdcK0=";
sourceRoot = "source/ui";
@ -37,18 +37,11 @@ rustPlatform.buildRustPackage rec {
libadwaita
];
postInstall = ''
install -Dm444 $src/ui/rsc/gay.pancake.lsfg-vk-ui.desktop $out/share/applications/gay.pancake.lsfg-vk-ui.desktop
install -Dm444 $src/ui/rsc/icon.png $out/share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png
'';
meta = {
description = "Graphical configuration interface for lsfg-vk";
meta = with lib; {
description = "Graphical interface for lsfg-vk";
homepage = "https://github.com/PancakeTAS/lsfg-vk/";
changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pabloaul ];
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "lsfg-vk-ui";
};
}

View file

@ -6,23 +6,27 @@
llvmPackages,
}:
llvmPackages.stdenv.mkDerivation rec {
llvmPackages.stdenv.mkDerivation {
pname = "lsfg-vk";
version = "1.0.0";
version = "0.9.0-2025-07-26-3c77bad";
src = fetchFromGitHub {
owner = "PancakeTAS";
repo = "lsfg-vk";
tag = "v${version}";
hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0=";
rev = "3c77bad7941e2699a797b2741b64b8d907118bb6";
hash = "sha256-ZAtTzdSx81NK2ABSEIDOeYUgJDH4ROMApDSlg8U140k=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace VkLayer_LS_frame_generation.json \
--replace-fail "liblsfg-vk.so" "$out/lib/liblsfg-vk.so"
--replace "liblsfg-vk.so" "$out/lib/liblsfg-vk.so"
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
nativeBuildInputs = [
llvmPackages.clang-tools
llvmPackages.libllvm
@ -33,12 +37,10 @@ llvmPackages.stdenv.mkDerivation rec {
vulkan-headers
];
meta = {
meta = with lib; {
description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)";
homepage = "https://github.com/PancakeTAS/lsfg-vk/";
changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pabloaul ];
license = licenses.mit;
platforms = platforms.linux;
};
}
}