Files
quantenzitrone 7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00

101 lines
2.1 KiB
Nix

{
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch2,
makeWrapper,
pkg-config,
zstd,
stdenv,
alsa-lib,
libxkbcommon,
udev,
vulkan-loader,
wayland,
libxrandr,
libxi,
libxcursor,
libx11,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jumpy";
version = "0.12.2";
src = fetchFromGitHub {
owner = "fishfolk";
repo = "jumpy";
tag = "v${finalAttrs.version}";
hash = "sha256-g/CpSycTCM1i6O7Mir+3huabvr4EXghDApquEUNny8c=";
};
# This patch may be removed in the next release
cargoPatches = [
(fetchpatch2 {
url = "https://github.com/fishfolk/jumpy/commit/8234e6d2c0b33c75e2112596ded1734fdba50fb8.patch?full_index=1";
hash = "sha256-IWjBw1Wj/6CT/x6xm6vfpUMfk7A5/EsdbPDvWywRFc8=";
})
];
cargoHash = "sha256-2I9s1zH94GRqXGBxZYyXOQwNeYrpV1UhUSKGCs9Ce9Q=";
nativeBuildInputs = [
makeWrapper
pkg-config
];
buildInputs = [
zstd
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
libxkbcommon
udev
vulkan-loader
wayland
libx11
libxcursor
libxi
libxrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
rustPlatform.bindgenHook
];
cargoBuildFlags = [
"--bin"
"jumpy"
];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
# jumpy only loads assets from the current directory
# https://github.com/fishfolk/bones/blob/f84d07c2f2847d9acd5c07098fe1575abc496400/framework_crates/bones_asset/src/io.rs#L50
postInstall = ''
mkdir $out/share
cp -r assets $out/share
wrapProgram $out/bin/jumpy --chdir $out/share
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf $out/bin/.jumpy-wrapped \
--add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
'';
meta = {
description = "Tactical 2D shooter played by up to 4 players online or on a shared screen";
mainProgram = "jumpy";
homepage = "https://fishfolk.org/games/jumpy";
changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [
mit # or
asl20
# Assets
cc-by-nc-40
];
maintainers = [ ];
};
})