commit 01a4aa202cdd1c92d1428cd0f8843a53bfe07bd9 · pyrox.dev/nixpkgs

+15 -41

nixos/tests/shadps4.nix

···

       21
       21
        
                 in

     

       22
       22
        
                 pkgs.runCommand "OpenOrbis-PNG-Sample"

     

       23
       23
        
                   {

     

       24
       24
       -
                     nativeBuildInputs = with pkgs; [ unzip ];

     

       24
       24
       +
                     nativeBuildInputs = with pkgs; [

     

       25
       25
       +
                       unzip

     

       26
       26
       +
                       liborbispkg-pkgtool

     

       27
       27
       +
                     ];

     

       25
       28
        
                     meta.license = lib.licenses.gpl3Only;

     

       26
       29
        
                   }

     

       27
       30
        
                   ''

     

       28
       31
        
                     unzip ${sample-packages} samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg

     

       29
       29
       -
                     mkdir $out

     

       30
       30
       -
                     mv samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample.pkg

     

       32
       32
       +
                     mkdir -p $out/OpenOrbis-PNG-Sample

     

       33
       33
       +
                     pkgtool pkg_extract samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample

     

       31
       34
        
                   '';

     

       32
       35
        
       

     

       33
       36
        
               systemPackages = with pkgs; [

     
···

       90
       93
        
               machine.wait_for_text("Play Time")

     

       91
       94
        
               machine.screenshot("0002-shadps4-started")

     

       92
       95
        
       

     

       93
       93
       -
           with subtest("installing example works"):

     

       96
       96
       +
           with subtest("running example works"):

     

       97
       97
       +
               # Ensure that chosen openorbis logo colour isn't present already

     

       98
       98
       +
               assert (

     

       99
       99
       +
                   check_for_color(openorbisColor)(True) == False

     

       100
       100
       +
               ), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor)

     

       101
       101
       +
       

     

       94
       102
        
               machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"

     

       95
       95
       -
               machine.wait_for_text("Install Packages")

     

       103
       103
       +
               machine.wait_for_text("Boot Game")

     

       96
       104
        
               machine.send_key("down")

     

       97
       105
        
               machine.send_key("ret")

     

       98
       106
        
       

     

       99
       107
        
               # Pick the PNG sample (hello world runs too, but text-only output is currently broken)

     

       100
       108
        
               machine.wait_for_text("Look in")

     

       101
       101
       -
               machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample.pkg\n")

     

       102
       102
       -
       

     

       103
       103
       -
               # Install to default dir

     

       104
       104
       -
               machine.wait_for_text("which directory")

     

       105
       105
       -
               machine.send_key("ret")

     

       106
       106
       -
       

     

       107
       107
       -
               # Wait for installation getting done & return to main window

     

       108
       108
       -
               machine.wait_for_text("successfully installed")

     

       109
       109
       -
               machine.send_key("ret")

     

       110
       110
       -
       

     

       111
       111
       -
               # Sample should now be listed

     

       112
       112
       -
               machine.wait_for_text("OpenOrbis PNG Sample")

     

       113
       113
       -
               machine.screenshot("0003-shadps4-sample-installed")

     

       114
       114
       -
       

     

       115
       115
       -
           with subtest("emulation works-ish"):

     

       116
       116
       -
               # Ensure that selection colours isn't present already

     

       117
       117
       -
               assert (

     

       118
       118
       -
                   check_for_color(selectionColor)(True) == False

     

       119
       119
       -
               ), "selectionColor {} was present on the screen before we selected anything!".format(selectionColor)

     

       120
       120
       -
       

     

       121
       121
       -
               # Select first installed app

     

       122
       122
       -
               machine.succeed("xdotool mousemove 20 150 click 1")

     

       123
       123
       -
       

     

       124
       124
       -
               # Waiting for selection to be confirmed

     

       125
       125
       -
               with machine.nested("Waiting for the screen to have selectionColor {} on it:".format(selectionColor)):

     

       126
       126
       -
                   retry(check_for_color(selectionColor))

     

       127
       127
       -
       

     

       128
       128
       -
               # Ensure that chosen openorbis logo colour isn't present already

     

       129
       129
       -
               assert (

     

       130
       130
       -
                   check_for_color(openorbisColor)(True) == False

     

       131
       131
       -
               ), "openorbisColor {} was present on the screen before we selected anything!".format(openorbisColor)

     

       132
       132
       -
       

     

       133
       133
       -
               # Click launch button

     

       134
       134
       -
               machine.succeed("xdotool mousemove 40 60 click 1")

     

       135
       135
       -
               machine.wait_for_console_text("Entering draw loop...")

     

       109
       109
       +
               machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n")

     

       136
       110
        
       

     

       137
       111
        
               # Look for logo

     

       138
       112
        
               with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):

     

       139
       113
        
                   retry(check_for_color(openorbisColor))

     

       140
       140
       -
               machine.screenshot("0004-shadps4-sample-running")

     

       114
       114
       +
               machine.screenshot("0003-shadps4-sample-running")

     

       141
       115
        
         '';

     

       142
       116
        
       }

+2 -2

pkgs/by-name/sh/shadps4/package.nix

···

       39
       39
        
       

     

       40
       40
        
       stdenv.mkDerivation (finalAttrs: {

     

       41
       41
        
         pname = "shadps4";

     

       42
       42
       -
         version = "0.7.0";

     

       42
       42
       +
         version = "0.9.0";

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner = "shadps4-emu";

     

       46
       46
        
           repo = "shadPS4";

     

       47
       47
        
           tag = "v.${finalAttrs.version}";

     

       48
       48
       -
           hash = "sha256-g55Ob74Yhnnrsv9+fNA1+uTJ0H2nyH5UT4ITHnrGKDo=";

     

       48
       48
       +
           hash = "sha256-ljnoClmijCds/ydqXaRuUL6/Qv/fGIkLyGsmfPDqvVo=";

     

       49
       49
        
           fetchSubmodules = true;

     

       50
       50
        
         };

     

       51
       51