commit 084fd6904550d915954791b6923e7a1ac4e9f3ec · pyrox.dev/nixpkgs

+32 -17

pkgs/games/jumpy/default.nix

···

       2
       2
        
       , rustPlatform

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , stdenv

     

       5
       5
       +
       , makeWrapper

     

       5
       6
        
       , pkg-config

     

       6
       7
        
       , alsa-lib

     

       7
       7
       -
       , libGL

     

       8
       8
       +
       , libxkbcommon

     

       9
       9
       +
       , udev

     

       10
       10
       +
       , vulkan-loader

     

       11
       11
       +
       , wayland

     

       8
       12
        
       , xorg

     

       9
       9
       -
       , udev

     

       10
       10
       -
       , Cocoa

     

       11
       11
       -
       , OpenGL

     

       13
       13
       +
       , darwin

     

       12
       14
        
       }:

     

       13
       15
        
       

     

       14
       16
        
       rustPlatform.buildRustPackage rec {

     

       15
       17
        
         pname = "jumpy";

     

       16
       16
       -
         version = "0.4.3";

     

       18
       18
       +
         version = "0.5.1";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "fishfolks";

     

       21
       21
       +
           owner = "fishfolk";

     

       20
       22
        
           repo = pname;

     

       21
       23
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8=";

     

       24
       24
       +
           sha256 = "sha256-5hgd4t9ZKHmv8wzED7Tn+ykzUM0EbQqRX15HBHzXtJY=";

     

       23
       25
        
         };

     

       24
       26
        
       

     

       25
       25
       -
         cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A=";

     

       27
       27
       +
         cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig=";

     

       26
       28
        
       

     

       27
       27
       -
         nativeBuildInputs = lib.optionals stdenv.isLinux [

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           makeWrapper

     

       31
       31
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       28
       32
        
           pkg-config

     

       29
       33
        
         ];

     

       30
       34
        
       

     

       31
       35
        
         buildInputs = lib.optionals stdenv.isLinux [

     

       32
       36
        
           alsa-lib

     

       33
       33
       -
           libGL

     

       37
       37
       +
           libxkbcommon

     

       38
       38
       +
           udev

     

       39
       39
       +
           vulkan-loader

     

       40
       40
       +
           wayland

     

       34
       41
        
           xorg.libX11

     

       42
       42
       +
           xorg.libXcursor

     

       35
       43
        
           xorg.libXi

     

       36
       36
       -
           udev

     

       44
       44
       +
           xorg.libXi

     

       45
       45
       +
           xorg.libXrandr

     

       37
       46
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       38
       38
       -
           Cocoa

     

       39
       39
       -
           OpenGL

     

       47
       47
       +
           darwin.apple_sdk.frameworks.Cocoa

     

       48
       48
       +
           rustPlatform.bindgenHook

     

       40
       49
        
         ];

     

       41
       50
        
       

     

       42
       51
        
         postPatch = ''

     

       43
       43
       -
           substituteInPlace src/main.rs \

     

       44
       44
       -
             --replace ./assets $out/share/assets \

     

       45
       45
       -
             --replace ./mods $out/share/mods

     

       52
       52
       +
           touch ../$(stripHash $cargoDeps)/taffy/README.md

     

       46
       53
        
         '';

     

       47
       54
        
       

     

       48
       55
        
         postInstall = ''

     

       49
       56
        
           mkdir $out/share

     

       50
       50
       -
           cp -r assets mods $out/share

     

       57
       57
       +
           cp -r assets $out/share

     

       58
       58
       +
           wrapProgram $out/bin/jumpy \

     

       59
       59
       +
             --set-default JUMPY_ASSET_DIR $out/share/assets

     

       60
       60
       +
         '';

     

       61
       61
       +
       

     

       62
       62
       +
         postFixup = lib.optionalString stdenv.isLinux ''

     

       63
       63
       +
           patchelf $out/bin/.jumpy-wrapped \

     

       64
       64
       +
             --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}

     

       51
       65
        
         '';

     

       52
       66
        
       

     

       53
       67
        
         meta = with lib; {

     

       54
       68
        
           description = "A tactical 2D shooter played by up to 4 players online or on a shared screen";

     

       55
       69
        
           homepage = "https://fishfight.org/";

     

       70
       70
       +
           changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}";

     

       56
       71
        
           license = with licenses; [ mit /* or */ asl20 ];

     

       57
       72
        
           maintainers = with maintainers; [ figsoda ];

     

       58
       73
        
         };

+1 -3

pkgs/top-level/all-packages.nix

···

       34282
       34282
        
       

     

       34283
       34283
        
         fish-fillets-ng = callPackage ../games/fish-fillets-ng { };

     

       34284
       34284
        
       

     

       34285
       34285
       -
         jumpy = callPackage ../games/jumpy {

     

       34286
       34286
       -
           inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;

     

       34287
       34287
       -
         };

     

       34285
       34285
       +
         jumpy = callPackage ../games/jumpy { };

     

       34288
       34286
        
       

     

       34289
       34287
        
         flightgear = libsForQt5.callPackage ../games/flightgear { };

     

       34290
       34288