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.

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

Already on GitHub? Sign in to your account

gnomeExtensions.ddterm: fix gjs path and dependencies #298973

Merged
merged 1 commit into from
May 24, 2024

Conversation

tmyllymaki
Copy link
Contributor

The new version has #!@GJS_SHEBANG@ which ended up as #!/usr/bin/gjs -> #!/usr/bin//nix/store../bin/gjs. This change changes the whole line before building.

Also added libhandy as dependency which is added in commit ddterm/gnome-shell-extension-ddterm@eade14f.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 馃憤 reaction to pull requests you find important.

Comment on lines 50 to 51
nativeBuildInputs = [ gjs gobject-introspection wrapGAppsHook ];
buildInputs = [ vte libhandy ];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nativeBuildInputs = [ gjs gobject-introspection wrapGAppsHook ];
buildInputs = [ vte libhandy ];
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
buildInputs = [ gjs vte libhandy ];

Imagine you're cross-compiling from x86_64-linux to aarch64-linux, you'll certainly want gjs to be native to aarch64-linux so that it runs on the host. So gjs should be in buildInputs.

@GreatTeacherOni
Copy link

As long as this PR is not merged #305991 is still open and an overlay would be necessary. How would that overlay look like on NixOS (without home-manager)? See my question here: #305991 (comment)

The new version has #!@GJS_SHEBANG@ which ended up as #!/usr/bin/gjs -> #!/usr/bin//nix/store../bin/gjs.

gnomeExtensions.ddterm: add libhandy as dependency

libhandy was added as dependency on commit: ddterm/gnome-shell-extension-ddterm@eade14f
@Artturin Artturin merged commit 5a69430 into NixOS:master May 24, 2024
24 checks passed
@tmyllymaki tmyllymaki deleted the update-ddterm branch May 29, 2024 05:27
@boustanihani
Copy link

When will this fix be available for NixOS 24.05 ??

@jtojnar jtojnar added the backport release-24.05 Backport PR automatically label Jun 1, 2024
Copy link
Contributor

github-actions bot commented Jun 1, 2024

Successfully created backport PR for release-24.05:

@boustanihani
Copy link

Successfully created backport PR for release-24.05:

Wow this was quick, thanks :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants