Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proton-ge-rtsp-bin: update to 9-22-rtsp-17 and prevent steam settings… #300

Merged
merged 1 commit into from
Jan 26, 2025
Merged

proton-ge-rtsp-bin: update to 9-22-rtsp-17 and prevent steam settings… #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/by-name/pr/proton-ge-rtsp-bin/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@
proton-ge-bin.overrideAttrs (
finalAttrs: _: {
pname = "proton-ge-rtsp-bin";
version = "GE-Proton9-20-rtsp16";
version = "GE-Proton9-22-rtsp17";

src = fetchzip {
url = "https://github.com/SpookySkeletons/proton-ge-rtsp/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-iq7oiDW5+51wzqYwASOGSV922c/pg1k29MdkIXlT34k=";
hash = "sha256-1zj0y7E9JWrnPC9HllFXos33rsdAt3q+NamoxNTmHHM=";
};

postBuild = ''
# prevents steam from resetting compatability settings (in addition to upstream's modifications)
sed -i -r 's|GE-Proton-rtsp[0-9]*|GE-Proton-rtsp|' $steamcompattool/compatibilitytool.vdf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer this to use substituteInPlace. You would have to change it from being a regex to a regular string substitution using the metadata we already have in the derivation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The upstream package in nixpkgs is already modifying it in the same way. This seems like a simpler way so we don't have to bookkeep the correct rtsp version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But anyway, changed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm, regex doesn't work with substituteInPlace, or I don't know how to correctly use it if there is a way

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this sed even work?

The file shows the following display name in my local copy: GE-Proton9-22-rtsp17. Quite conveniently, this is the exact value of version. We should be able to use substituteInPlace here

sed -i -r 's|GE-Proton-rtsp[0-9]*|GE-Proton-rtsp|' $steamcompattool/proton
'';

meta = {
inherit (proton-ge-bin.meta)
description
Expand Down
Loading