From d3fc63c9f237a1f764d8e67aeddccfb62f2d1b4a Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Tue, 28 Oct 2025 15:09:40 +0400 Subject: [PATCH] srb2kart: refactor derrivation --- pkgs/by-name/sr/srb2kart/package.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix index 394686a94de4..42e00c935189 100644 --- a/pkgs/by-name/sr/srb2kart/package.nix +++ b/pkgs/by-name/sr/srb2kart/package.nix @@ -32,24 +32,11 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" ''; - assets = stdenv.mkDerivation { - pname = "srb2kart-data"; - version = finalAttrs.version; - - src = fetchzip { - url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; - hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/srb2kart - cp -r * $out/share/srb2kart - - runHook postInstall - ''; + assets = fetchzip { + name = "srb2kart-data"; + url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; + hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; + stripRoot = false; }; nativeBuildInputs = [ @@ -69,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart" + "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" @@ -96,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/srb2kart $out/bin/srb2kart wrapProgram $out/bin/srb2kart \ - --set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart" + --set-default SRB2WADDIR ${finalAttrs.assets} runHook postInstall '';