diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch index 29345952433e..2b4de54ae54d 100644 --- a/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch +++ b/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch @@ -1,11 +1,9 @@ -diff --git a/meson.build b/meson.build -index 1311784..77043ac 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,6 @@ project( default_options: [ - 'cpp_std=c++14', + 'cpp_std=c++20', 'warning_level=2', -- 'force_fallback_for=wlroots,libliftoff', +- 'force_fallback_for=wlroots,libliftoff,vkroots', ], ) |