diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-11-19 17:17:10 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-19 17:17:10 -0300 |
commit | 0fd0bd0f35e4c50d85b80af20584ad12a4b3a930 (patch) | |
tree | 415631d32b262eb528d71f4dac52ddbe7fc10844 | |
parent | ee19d044d411c4cdc3526d5b0ed671c0098267fc (diff) | |
parent | f5110c71823355b7ec63f4bb171ebf4eba8bf4b9 (diff) | |
download | nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar.gz nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar.bz2 nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar.lz nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar.xz nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.tar.zst nixlib-0fd0bd0f35e4c50d85b80af20584ad12a4b3a930.zip |
Merge pull request #201851 from atorres1985-contrib/duckstation
duckstation: remove unneeded rec
-rw-r--r-- | pkgs/applications/emulators/duckstation/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 88deb6653a02..31869fa9fe36 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -4,11 +4,11 @@ , SDL2 , cmake , copyDesktopItems -, makeDesktopItem , curl , extra-cmake-modules -, libpulseaudio , libXrandr +, libpulseaudio +, makeDesktopItem , mesa # for libgbm , ninja , pkg-config @@ -18,14 +18,16 @@ , vulkan-loader , wayland , wrapQtAppsHook +, enableWayland ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duckstation"; version = "unstable-2022-11-18"; + src = fetchFromGitHub { owner = "stenzek"; - repo = pname; + repo = "duckstation"; rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; }; @@ -49,13 +51,13 @@ stdenv.mkDerivation rec { qtbase qtsvg vulkan-loader - wayland - ]; + ] + ++ lib.optionals enableWayland [ wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" - ]; + ] + ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem { |