gamescope: 3.11.49 -> 3.11.52-beta6

[Scrumplex]

NOTE: This PR will probably be updated a few times until the eventual release of gamescope 3.11.52

• openvr: init at 1.23.8:
  • SDK for interacting with SteamVR, Project page
  • Patches are the same as used by Arch Linux
  • Required by gamescope for running as an OpenVR overlay
• libliftoff: 0.3.0 -> 0.4.0
  • Changelog, Project page
  • Bump required by gamescope
• gamescope: 3.11.49 -> 3.11.52-beta6
  • Project page
  • Patches are here to fix the build in its current state. They are probably going to be unneeded for the stable release of 3.11.52

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 23.05 Release Notes (or backporting 22.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

[Scrumplex]

As an aside: I would be interested in co-maintaining gamescope and maybe libliftoff, as I maintained packages for these on the Arch Linux User Repository, before moving to NixOS.

[PedroHLC]

@Scrumplex note that I have a few of the same in #215343 if you need something, kindly let me know.

UPDATE: Also, Joshua said he does not want us to put vkroots as global package, since he'll never add a stable API to it, he believes it's better for every package to target a specific commit in the repo. But like you I did it anyway.

UPDATE2: Put us both as co-maintainers of everything here 😄

UPDATE3: Since you're adding the patches manually to a release tag, I could totally rebase my POC in this branch and stop bumping gamescope to untagged refs.

UPDATE4: If possible, please take a look at #187507 -- I wish we could resurrect and merge it.

[PedroHLC]

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

6 packages built:

• bottles
• bottles-unwrapped
• gamescope
• libliftoff
• openvr
• vkroots

[Scrumplex]

@Scrumplex note that I have a few of the same in #215343 if you need something, kindly let me know.

👍

UPDATE: Also, Joshua said he does not want us to put vkroots as global package, since he'll never add a stable API to it, he believes it's better for every package to target a specific commit in the repo. But like you I did it anyway.

I just added vkroots inline in gamescope to address this. Especially as it's a header-only library it shouldn't really matter too much.

UPDATE2: Put us both as co-maintainers of everything here

done :D

UPDATE3: Since you're adding the patches manually to a release tag, I could totally rebase my POC in this branch and stop bumping gamescope to untagged refs.

sure :D

[superherointj]

Would be good to fetchpatch from source patch.

[PedroHLC]

I'll test this in my system, just a sec.

[superherointj]

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

3 packages failed to build:

• bottles
• bottles-unwrapped
• gamescope

2 packages built:

• libliftoff
• openvr

Error logs for:

• /nix/store/5ddg3mqi98qwdqpap1d5d0xkabim34qg-gamescope-3.11.52-beta6.drv
  • https://termbin.com/w25j0

[PedroHLC]

In gamescope:

/nix/store/fhzz4yrdy17czwc9i4swhlpcp445inzb-binutils-2.40/bin/ld: /nix/store/8s3ancq1nkbv1ir7n17yxhpdzvsak6i2-openvr-1.23.8/lib/libopenvr_api.so: undefined reference to `Json::Value::operator=(Json::Value)'
/nix/store/fhzz4yrdy17czwc9i4swhlpcp445inzb-binutils-2.40/bin/ld: /nix/store/8s3ancq1nkbv1ir7n17yxhpdzvsak6i2-openvr-1.23.8/lib/libopenvr_api.so: undefined reference to `Json::Value::operator!() const'

[superherointj]

Suggested change

	platforms = with platforms; unix;
	platforms = platforms.unix;

[Scrumplex]

Looks like fetchpatch actually breaks patches (from GitHub) that rename files. The OpenVR patch to support the system installation of jsoncpp, also included headers of the in-tree jsoncpp, which is why there was this mismatch.

Am I missing a specific option of fetchpatch here?

[superherointj]

Looks like fetchpatch actually breaks patches (from GitHub) that rename files. The OpenVR patch to support the system installation of jsoncpp, also included headers of the in-tree jsoncpp, which is why there was this mismatch.

Am I missing a specific option of fetchpatch here?

Try to reference the commit not the PR. We don't reference the PR, only commits. Because PR can change.

[Scrumplex]

Seems like this is a known issue (#32084). I also tried using fetchpatch2 and also tried to pull in the commits separately, but it doesn't work.

This is what I got when I tried fetchpatch2:

error: Normalized patch '/build/patch' is empty (while the fetched file was not)!
Did you maybe fetch a HTML representation of a patch instead of a raw patch?
Fetched file was:
From a7a6995d1d6f9ee1a17a3741661156f9706c40ce Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
Date: Thu, 15 Aug 2019 15:05:34 +0200
Subject: [PATCH] thirdparty: Move jsoncpp to thridparty directory.

Even though the previous patch in this patch set enabled the build with
a system wide jsoncpp and worked for me, it still left the internal
jsoncpp includes in the include path, since the includes were placed
in `CMAKE_CURRENT_SOURCE_DIR`. This could cause problems on other systems
when trying to build with a system wide jsoncpp.

In order to remove the internal json.h from the include path,
I moved all jsoncpp files into a thridparty directory amd include
it in the case of `USE_SYSTEM_JSONCPP` not being set.
---
 {src => thirdparty/jsoncpp}/json/json-forwards.h | 0
 {src => thirdparty/jsoncpp}/json/json.h          | 0
 {src => thirdparty/jsoncpp}/jsoncpp.cpp          | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {src => thirdparty/jsoncpp}/json/json-forwards.h (100%)
 rename {src => thirdparty/jsoncpp}/json/json.h (100%)
 rename {src => thirdparty/jsoncpp}/jsoncpp.cpp (100%)

diff --git a/src/json/json-forwards.h b/thirdparty/jsoncpp/json/json-forwards.h
similarity index 100%
rename from src/json/json-forwards.h
rename to thirdparty/jsoncpp/json/json-forwards.h
diff --git a/src/json/json.h b/thirdparty/jsoncpp/json/json.h
similarity index 100%
rename from src/json/json.h
rename to thirdparty/jsoncpp/json/json.h
diff --git a/src/jsoncpp.cpp b/thirdparty/jsoncpp/jsoncpp.cpp
similarity index 100%
rename from src/jsoncpp.cpp
rename to thirdparty/jsoncpp/jsoncpp.cpp

[superherointj]

Seems like this is a known issue (#32084). I also tried using fetchpatch2 and also tried to pull in the commits separately, but it doesn't work.

Feel free to include the patch file then. (but only for patches that fetchpatch didn't work.)

[Scrumplex]

Feel free to include the patch file then.

Well in this case, we only really need to deal with a directory being renamed, so I am just going to add a postUnpack stage.

[superherointj]

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

5 packages built:

• bottles
• bottles-unwrapped
• gamescope
• libliftoff
• openvr

[PedroHLC]

Tested it in a live system, gamescope was able to handle CDPR launcher and the Witcher 3 as expected.

[NguyenCuong17012021]

Tess