pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #201827 from SuperSamus/duckstation

duckstation: unstable-2022-07-08 -> 2022-11-18

authored by Anderson Torres and committed by GitHub 3325a804 7837e812

+10 -11
unified split
+9 -10
pkgs/applications/emulators/duckstation/default.nix
··· 7 , makeDesktopItem 8 , curl 9 , extra-cmake-modules 10 - , libevdev 11 , libpulseaudio 12 , libXrandr 13 , mesa # for libgbm 14 , ninja 15 , pkg-config 16 , qtbase 17 , qttools 18 , vulkan-loader 19 - #, wayland # Wayland doesn't work correctly this version 20 , wrapQtAppsHook 21 }: 22 23 stdenv.mkDerivation rec { 24 pname = "duckstation"; 25 - version = "unstable-2022-07-08"; 26 - 27 src = fetchFromGitHub { 28 owner = "stenzek"; 29 repo = pname; 30 - rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; 31 - sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; 32 }; 33 34 nativeBuildInputs = [ ··· 44 buildInputs = [ 45 SDL2 46 curl 47 - libevdev 48 libpulseaudio 49 libXrandr 50 mesa 51 qtbase 52 vulkan-loader 53 - #wayland 54 ]; 55 56 cmakeFlags = [ 57 "-DUSE_DRMKMS=ON" 58 - #"-DUSE_WAYLAND=ON" 59 ]; 60 61 desktopItems = [ ··· 80 cp -r bin $out/share/duckstation 81 ln -s $out/share/duckstation/duckstation-qt $out/bin/ 82 83 - install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png 84 85 runHook postInstall 86 '';
··· 7 , makeDesktopItem 8 , curl 9 , extra-cmake-modules 10 , libpulseaudio 11 , libXrandr 12 , mesa # for libgbm 13 , ninja 14 , pkg-config 15 , qtbase 16 + , qtsvg 17 , qttools 18 , vulkan-loader 19 + , wayland 20 , wrapQtAppsHook 21 }: 22 23 stdenv.mkDerivation rec { 24 pname = "duckstation"; 25 + version = "unstable-2022-11-18"; 26 src = fetchFromGitHub { 27 owner = "stenzek"; 28 repo = pname; 29 + rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; 30 + sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; 31 }; 32 33 nativeBuildInputs = [ ··· 43 buildInputs = [ 44 SDL2 45 curl 46 libpulseaudio 47 libXrandr 48 mesa 49 qtbase 50 + qtsvg 51 vulkan-loader 52 + wayland 53 ]; 54 55 cmakeFlags = [ 56 "-DUSE_DRMKMS=ON" 57 + "-DUSE_WAYLAND=ON" 58 ]; 59 60 desktopItems = [ ··· 79 cp -r bin $out/share/duckstation 80 ln -s $out/share/duckstation/duckstation-qt $out/bin/ 81 82 + install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png 83 84 runHook postInstall 85 '';
+1 -1
pkgs/top-level/all-packages.nix
··· 1553 1554 dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; 1555 1556 - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; 1557 1558 dynamips = callPackage ../applications/emulators/dynamips { }; 1559
··· 1553 1554 dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; 1555 1556 + duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; 1557 1558 dynamips = callPackage ../applications/emulators/dynamips { }; 1559