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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnvim: 0.1.6 -> 0.3.1 #204082

Merged
merged 4 commits into from
May 9, 2023
Merged

gnvim: 0.1.6 -> 0.3.1 #204082

merged 4 commits into from
May 9, 2023

Conversation

minijackson
Copy link
Member

@minijackson minijackson commented Dec 2, 2022

Description of changes

Changes:

Also fix build on Darwin.

ZHF: #230712

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:
  • 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Dec 2, 2022
@teto
Copy link
Member

teto commented Dec 2, 2022

works on linux but other platforms dont like the change

@raphaelr
Copy link
Contributor

raphaelr commented Dec 3, 2022

works on linux but other platforms dont like the change

gnvim-unwrapped builds, the problem is the wrapper

imo the gnvim.app is an artifact from the time where gnvim depended on webkitgtk, and is not needed anymore. So I'd replace the wrapper with something like

buildCommand = ''
    makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
      --prefix PATH : "${neovim}/bin" \
      --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
    mkdir -p "$out/share"
  '' + lib.optionalString (!stdenv.isDarwin) ''
    ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
    # copy and fix .desktop file
    cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
    # Sed needs a writable directory to do inplace modifications
    chmod u+rw "$out/share/applications"
    sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop
  '';

That should at least make the build process happy

@Icy-Thought
Copy link
Contributor

@minijackson are you still interested in getting this PR merged?

@teto
Copy link
Member

teto commented Apr 18, 2023

ping. would be nice to have in 23.05

@minijackson
Copy link
Member Author

Sorry for the delay. Can someone test on darwin?

@minijackson minijackson changed the title gnvim: 0.1.6 -> 0.2.0 gnvim: 0.1.6 -> 0.2.1 May 9, 2023
@teto
Copy link
Member

teto commented May 9, 2023

I am tempted to merge as is as it's hard to get darwin users. At least it builds. What do you think ? I would merge the commits 0.2 -> 0.3 and 0.3 -> 0.3.1 together + merged the darwin fix with the previous commit.

@SuperSandro2000 SuperSandro2000 changed the title gnvim: 0.1.6 -> 0.2.1 gnvim: 0.1.6 -> 0.3.1 May 9, 2023
@SuperSandro2000 SuperSandro2000 merged commit 6810db9 into NixOS:master May 9, 2023
@minijackson minijackson deleted the gnvim-0.2.0 branch May 9, 2023 11:27
@minijackson
Copy link
Member Author

@teto Considering the darwin build failure went unnoticed for a while, I think that's fine, yeah.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: vim 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants