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
@@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }:
{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }:
python3Packages.buildPythonApplication rec {
pname = "rabbitvcs";
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
};
buildInputs = [ gtk3 ];
pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ];
pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ];
prePatch = ''
sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py
@@ -19,7 +19,7 @@
stdenv,
symlinkJoin,
webkit2-sharp,
xdg_utils,
xdg-utils,
}:
stdenv.mkDerivation rec {
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
mono
openssh
openssl
xdg_utils
xdg-utils
];
}}/bin \
--set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [