Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce08cf0a29b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e12d4b40922
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 5, 2020

  1. neovim: Do $PATH lookup in neovim.desktop instead of hardcoding deriv… 

    …ation

See db236e5 "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

Simply stop adding the full derivation path for neovim and stick with
how upstream uses no path at all.

While here, take care of gnvim.desktop as well by adjusting the sed(1)
expression (and simplifying it in one go);  I do not use gnvim.desktop
but built it and confirmed the resulting files to contain no full paths
any longer.
    @klemensn @andir
    klemensn authored and andir committed Nov 5, 2020
    Copy the full SHA
    e0f258f View commit details

  2. teams: Do $PATH lookup in teams.desktop instead of hardcoding derivation 

    See db236e5 "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

I verified that there are no other (executable) paths in the .desktop
file and therefore went for this minimal diff.
    @klemensn @andir
    klemensn authored and andir committed Nov 5, 2020
    Copy the full SHA
    5e12d4b View commit details
4 changes: 1 addition & 3 deletions pkgs/applications/editors/neovim/gnvim/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -23,9 +23,7 @@ stdenv.mkDerivation {
cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
# Sed needs a writable directory to do inplace modifications
chmod u+rw "$out/share/applications"
for file in $out/share/applications/*.desktop; do
sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file"
done
sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop
'';

preferLocalBuild = true;
1 change: 0 additions & 1 deletion pkgs/applications/editors/neovim/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ let
postBuild = lib.optionalString stdenv.isLinux ''
rm $out/share/applications/nvim.desktop
substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
--replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
--replace 'Name=Neovim' 'Name=WrappedNeovim'
''
+ optionalString withPython2 ''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/teams/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
mv share $out/share
substituteInPlace $out/share/applications/teams.desktop \
--replace /usr/bin/ $out/bin/
--replace /usr/bin/ ""
ln -s $out/opt/teams/teams $out/bin/