mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
xonotic: use copyDesktopItems hook
This commit is contained in:
parent
81e2df3ce1
commit
74088bad64
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem
|
||||
, xonotic-data
|
||||
, xonotic-data, copyDesktopItems
|
||||
, # required for both
|
||||
unzip, libjpeg, zlib, libvorbis, curl
|
||||
, # glx
|
||||
@ -131,7 +131,8 @@ in rec {
|
||||
|
||||
xonotic = runCommandNoCC "xonotic${variant}-${version}" {
|
||||
inherit xonotic-unwrapped;
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
desktopItems = [ desktopItem ];
|
||||
passthru = {
|
||||
inherit version;
|
||||
meta = meta // {
|
||||
@ -151,7 +152,7 @@ in rec {
|
||||
'' + lib.optionalString (withSDL || withGLX) ''
|
||||
mkdir -p $out/share
|
||||
ln -s ${xonotic-unwrapped}/share/icons $out/share/icons
|
||||
${desktopItem.buildCommand}
|
||||
copyDesktopItems
|
||||
'' + ''
|
||||
for binary in $out/bin/xonotic-*; do
|
||||
wrapProgram $binary --add-flags "-basedir ${xonotic-data}"
|
||||
|
Loading…
Reference in New Issue
Block a user