Merge pull request #111519 from siraben/xdg-utils-naming

This commit is contained in:
Jan Tojnar
2021-02-01 17:18:57 +01:00
committed by GitHub
47 changed files with 90 additions and 90 deletions
@@ -1,4 +1,4 @@
{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:
{lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}:
stdenv.mkDerivation rec {
pname = "git-open";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp git-open $out/bin
wrapProgram $out/bin/git-open \
--prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}"
--prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}"
'';
meta = with lib; {
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }:
buildGoModule rec {
pname = "lab";
@@ -22,7 +22,7 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}";
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}";
for shell in bash fish zsh; do
$out/bin/lab completion $shell > lab.$shell
installShellCompletion lab.$shell