swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-19 20:09:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296418 from donovanglover/srb2-cleanup

Browse source 
srb2: fetch assets from upstream GitLab, add startupWMClass to desktop item
This commit is contained in:
Peder Bergebakken Sundt 2024-04-06 21:18:37 +02:00 committed by GitHub
parent 888d5c0b6b a098790c31
commit c6a76df8ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/games/srb2/cmake.patch → pkgs/by-name/sr/srb2/cmake.patch
View file

30
pkgs/games/srb2/default.nix → pkgs/by-name/sr/srb2/package.nix
View file

@ -1,18 +1,16 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchgit
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, curl , curl
, nasm , nasm
, libopenmpt , libopenmpt
, p7zip
, game-music-emu , game-music-emu
, libpng , libpng
, SDL2 , SDL2
, SDL2_mixer , SDL2_mixer
, zlib , zlib
, unzip
, makeWrapper , makeWrapper
, makeDesktopItem , makeDesktopItem
, copyDesktopItems , copyDesktopItems
@ -32,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
nasm nasm
p7zip
makeWrapper makeWrapper
copyDesktopItems copyDesktopItems
]; ];
@ -51,20 +48,20 @@ stdenv.mkDerivation (finalAttrs: {
pname = "srb2-data"; pname = "srb2-data";
version = finalAttrs.version; version = finalAttrs.version;
nativeBuildInputs = [ src = fetchgit {
unzip url = "https://git.do.srb2.org/STJr/srb2assets-public";
]; rev = "SRB2_release_${finalAttrs.version}";
hash = "sha256-OXvO5ZlujIYmYevc62Dtx192dxoujQMNFUCrH5quBBg=";
src = fetchurl { fetchLFS = true;
url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${finalAttrs.version}/SRB2-v${lib.replaceStrings ["."] [""] finalAttrs.version}-Full.zip";
hash = "sha256-g7kaNRE1tjcF5J2v+kTnrDzz4zs5f1b/NH67ce2ifUo=";
}; };
sourceRoot = ".";
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/share/srb2 mkdir -p $out/share/srb2
cp -r *pk3 *dta *dat models/ $out/share/srb2/ cp -r * $out/share/srb2
runHook postInstall
''; '';
}; };
@ -92,10 +89,13 @@ stdenv.mkDerivation (finalAttrs: {
desktopName = name; desktopName = name;
genericName = name; genericName = name;
categories = [ "Game" ]; categories = [ "Game" ];
startupWMClass = ".srb2-wrapped";
}) })
]; ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/applications $out/share/pixmaps $out/share/icons mkdir -p $out/bin $out/share/applications $out/share/pixmaps $out/share/icons
copyDesktopItems copyDesktopItems
@ -105,6 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
cp bin/lsdlsrb2 $out/bin/srb2 cp bin/lsdlsrb2 $out/bin/srb2
wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2" wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2"
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {

0
pkgs/games/srb2/thirdparty.patch → pkgs/by-name/sr/srb2/thirdparty.patch
View file

2
pkgs/top-level/all-packages.nix
View file

@ -37632,8 +37632,6 @@ with pkgs;
springLobby = callPackage ../games/spring/springlobby.nix { }; springLobby = callPackage ../games/spring/springlobby.nix { };
srb2 = callPackage ../games/srb2 { };
ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
stardust = callPackage ../games/stardust { }; stardust = callPackage ../games/stardust { };