commit 9511a7b219df1f8d8f5c2a58c4870fde169fe397 · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/emulators/duckstation/002-hardcode-vars.diff

···

       1
       1
        
       diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh

     

       2
       2
       -
       index 9c1dacab..d1f895ee 100755

     

       2
       2
       +
       index 9122cd8..50ed8f9 100755

     

       3
       3
        
       --- a/src/scmversion/gen_scmversion.sh

     

       4
       4
        
       +++ b/src/scmversion/gen_scmversion.sh

     

       5
       5
        
       @@ -10,10 +10,10 @@ else

     
···

       8
       8
        
        

     

       9
       9
        
       -HASH=$(git rev-parse HEAD)

     

       10
       10
        
       -BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')

     

       11
       11
       -
       -TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n')

     

       11
       11
       +
       -TAG=$(git describe --dirty | tr -d '\r\n')

     

       12
       12
        
       -DATE=$(git log -1 --date=iso8601-strict --format=%cd)

     

       13
       13
        
       +HASH="@gitHash@"

     

       14
       14
        
       +BRANCH="@gitBranch@"

+25 -32

pkgs/applications/emulators/duckstation/default.nix

···

       9
       9
        
       , extra-cmake-modules

     

       10
       10
        
       , libXrandr

     

       11
       11
        
       , libbacktrace

     

       12
       12
       -
       , makeDesktopItem

     

       12
       12
       +
       , makeWrapper

     

       13
       13
        
       , ninja

     

       14
       14
        
       , pkg-config

     

       15
       15
        
       , qtbase

     
···

       20
       20
        
       , vulkan-loader

     

       21
       21
        
       , wayland

     

       22
       22
        
       , wrapQtAppsHook

     

       23
       23
       -
       , enableWayland ? true

     

       24
       23
        
       }:

     

       25
       24
        
       

     

       26
       25
        
       stdenv.mkDerivation (finalAttrs: {

     

       27
       26
        
         pname = "duckstation";

     

       28
       28
       -
         version = "unstable-2023-09-30";

     

       27
       27
       +
         version = "0.1-6292";

     

       29
       28
        
       

     

       30
       29
        
         src = fetchFromGitHub {

     

       31
       30
        
           owner = "stenzek";

     

       32
       31
        
           repo = "duckstation";

     

       33
       33
       -
           rev = "d5608bf12df7a7e03750cb94a08a3d7999034ae2";

     

       34
       34
       -
           hash = "sha256-ktfZgacjkN6GQb1vLmyTZMr8QmmH12qAvFSIBTjgRSs=";

     

       32
       32
       +
           rev = "0bc42c38aab49030118f507c9783de047769148b";

     

       33
       33
       +
           hash = "sha256-8OavixSwEWihFY2fEdsepR1lqWlTH+//xZRKwb7lFCQ=";

     

       35
       34
        
         };

     

       36
       35
        
       

     

       37
       36
        
         patches = [

     
···

       42
       41
        
             src = ./002-hardcode-vars.diff;

     

       43
       42
        
             gitHash = finalAttrs.src.rev;

     

       44
       43
        
             gitBranch = "master";

     

       45
       45
       -
             gitTag = "0.1-5889-gd5608bf1";

     

       46
       46
       -
             gitDate = "2023-09-30T23:20:09+10:00";

     

       44
       44
       +
             gitTag = "${finalAttrs.version}-g0bc42c38";

     

       45
       45
       +
             gitDate = "2024-02-06T22:47:47+09:00";

     

       47
       46
        
           })

     

       48
       47
        
         ];

     

       49
       48
        
       

     

       50
       49
        
         nativeBuildInputs = [

     

       51
       50
        
           cmake

     

       52
       51
        
           copyDesktopItems

     

       52
       52
       +
           extra-cmake-modules

     

       53
       53
        
           ninja

     

       54
       54
        
           pkg-config

     

       55
       55
        
           qttools

     

       56
       56
        
           wrapQtAppsHook

     

       57
       57
       -
         ]

     

       58
       58
       -
         ++ lib.optionals enableWayland [

     

       59
       59
       -
           extra-cmake-modules

     

       60
       57
        
         ];

     

       61
       58
        
       

     

       62
       59
        
         buildInputs = [

     
···

       66
       63
        
           libbacktrace

     

       67
       64
        
           qtbase

     

       68
       65
        
           qtsvg

     

       69
       69
       -
           vulkan-loader

     

       70
       70
       -
         ]

     

       71
       71
       -
         ++ lib.optionals enableWayland [

     

       72
       66
        
           qtwayland

     

       73
       67
        
           wayland

     

       74
       68
        
         ]

     
···

       78
       72
        
       

     

       79
       73
        
         cmakeFlags = [

     

       80
       74
        
           (lib.cmakeBool "BUILD_TESTS" true)

     

       81
       81
       -
           (lib.cmakeBool "ENABLE_WAYLAND" enableWayland)

     

       82
       82
       -
         ];

     

       83
       83
       -
       

     

       84
       84
       -
         desktopItems = [

     

       85
       85
       -
           (makeDesktopItem {

     

       86
       86
       -
             name = "duckstation-qt";

     

       87
       87
       -
             desktopName = "DuckStation";

     

       88
       88
       -
             genericName = "PlayStation 1 Emulator";

     

       89
       89
       -
             icon = "duckstation";

     

       90
       90
       -
             tryExec = "duckstation-qt";

     

       91
       91
       -
             exec = "duckstation-qt %f";

     

       92
       92
       -
             comment = "Fast PlayStation 1 emulator";

     

       93
       93
       -
             categories = [ "Game" "Emulator" "Qt" ];

     

       94
       94
       -
             type = "Application";

     

       95
       95
       -
           })

     

       96
       75
        
         ];

     

       97
       76
        
       

     

       98
       77
        
         doCheck = true;

     
···

       110
       89
        
           cp -r bin $out/share/duckstation

     

       111
       90
        
           ln -s $out/share/duckstation/duckstation-qt $out/bin/

     

       112
       91
        
       

     

       113
       113
       -
           install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png

     

       92
       92
       +
           install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop

     

       93
       93
       +
           install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png

     

       114
       94
        
       

     

       115
       95
        
           runHook postInstall

     

       116
       96
        
         '';

     

       117
       97
        
       

     

       118
       118
       -
         qtWrapperArgs = [

     

       119
       119
       -
           "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}"

     

       120
       120
       -
         ];

     

       98
       98
       +
         qtWrapperArgs =

     

       99
       99
       +
           let

     

       100
       100
       +
             libPath = lib.makeLibraryPath ([

     

       101
       101
       +
               vulkan-loader

     

       102
       102
       +
             ] ++ cubeb.passthru.backendLibs);

     

       103
       103
       +
           in [

     

       104
       104
       +
             "--prefix LD_LIBRARY_PATH : ${libPath}"

     

       105
       105
       +
           ];

     

       106
       106
       +
       

     

       107
       107
       +
         # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh

     

       108
       108
       +
         # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run

     

       109
       109
       +
         postFixup = ''

     

       110
       110
       +
           source "${makeWrapper}/nix-support/setup-hook"

     

       111
       111
       +
           wrapProgram $out/bin/duckstation-qt \

     

       112
       112
       +
             --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'

     

       113
       113
       +
         '';

     

       121
       114
        
       

     

       122
       115
        
         meta = {

     

       123
       116
        
           homepage = "https://github.com/stenzek/duckstation";