Merge pull request #300050 from ianmjones/snippetexpander-1.0.2
snippetexpander: 1.0.1 -> 1.0.2
This commit is contained in:
commit
92323443a5
|
@ -1,9 +1,11 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, fetchFromSourcehut
|
, fetchFromSourcehut
|
||||||
|
, makeWrapper
|
||||||
, scdoc
|
, scdoc
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, snippetexpanderd
|
, snippetexpanderd
|
||||||
|
, snippetexpanderx
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -11,24 +13,27 @@ buildGoModule rec {
|
||||||
|
|
||||||
pname = "snippetexpander";
|
pname = "snippetexpander";
|
||||||
|
|
||||||
vendorHash = "sha256-wSAho59yxcXTu1zQ5x783HT4gtfSM4GdsOEeC1wfHhE=";
|
vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
modRoot = "cmd/snippetexpander";
|
modRoot = "cmd/snippetexpander";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
scdoc
|
scdoc
|
||||||
installShellFiles
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
snippetexpanderd
|
snippetexpanderd
|
||||||
|
snippetexpanderx
|
||||||
];
|
];
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
"-X 'main.version=${src.rev}'"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -36,12 +41,18 @@ buildGoModule rec {
|
||||||
installManPage snippetexpander.1
|
installManPage snippetexpander.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
postFixup = ''
|
||||||
|
# Ensure snippetexpanderd and snippetexpanderx are available to start/stop.
|
||||||
|
wrapProgram $out/bin/snippetexpander \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ snippetexpanderd snippetexpanderx ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
description = "Your little expandable text snippet helper CLI";
|
description = "Your little expandable text snippet helper CLI";
|
||||||
homepage = "https://snippetexpander.org";
|
homepage = "https://snippetexpander.org";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ ianmjones ];
|
maintainers = with lib.maintainers; [ ianmjones ];
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
mainProgram = "snippetexpander";
|
mainProgram = "snippetexpander";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,44 +2,49 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, fetchFromSourcehut
|
, fetchFromSourcehut
|
||||||
, pkg-config
|
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, scdoc
|
, scdoc
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, xorg
|
, xclip
|
||||||
, gtk3
|
, wl-clipboard
|
||||||
|
, xdotool
|
||||||
|
, wtype
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "snippetexpanderd";
|
pname = "snippetexpanderd";
|
||||||
version = "1.0.1";
|
version = "1.0.2";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~ianmjones";
|
owner = "~ianmjones";
|
||||||
repo = "snippetexpander";
|
repo = "snippetexpander";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-y3TJ+L3kXYfZFzAD1vmhvP6Yarctu5LHq/74005h8sI=";
|
hash = "sha256-iEoBri+NuFfLkARUBA+D/Fe9xk6PPV62N/YRqPv9C/A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-QX8HI8I1ZJI6HJ1sl86OiJ4nxwFAjHH8h1zB9ASJaQs=";
|
vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
|
||||||
|
|
||||||
|
proxyVendor = true;
|
||||||
|
|
||||||
modRoot = "cmd/snippetexpanderd";
|
modRoot = "cmd/snippetexpanderd";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
|
||||||
makeWrapper
|
makeWrapper
|
||||||
scdoc
|
scdoc
|
||||||
installShellFiles
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
xorg.libX11
|
xclip
|
||||||
gtk3
|
wl-clipboard
|
||||||
|
xdotool
|
||||||
|
wtype
|
||||||
];
|
];
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
"-X 'main.version=${src.rev}'"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -48,16 +53,17 @@ buildGoModule rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
# Ensure xclip/wcopy and xdotool/wtype are available for copy and paste duties.
|
||||||
wrapProgram $out/bin/snippetexpanderd \
|
wrapProgram $out/bin/snippetexpanderd \
|
||||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 ]}
|
--prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard xdotool wtype ]}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Your little expandable text snippet helper daemon";
|
description = "Your little expandable text snippet helper daemon";
|
||||||
homepage = "https://snippetexpander.org";
|
homepage = "https://snippetexpander.org";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ ianmjones ];
|
maintainers = with lib.maintainers; [ ianmjones ];
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
mainProgram = "snippetexpanderd";
|
mainProgram = "snippetexpanderd";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, fetchFromSourcehut
|
, fetchFromSourcehut
|
||||||
, makeWrapper
|
, wrapGAppsHook
|
||||||
, wails
|
, wails
|
||||||
, scdoc
|
, scdoc
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
, webkitgtk
|
, webkitgtk
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, snippetexpanderd
|
, snippetexpanderd
|
||||||
|
, snippetexpanderx
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -17,30 +18,31 @@ buildGoModule rec {
|
||||||
|
|
||||||
pname = "snippetexpandergui";
|
pname = "snippetexpandergui";
|
||||||
|
|
||||||
vendorHash = "sha256-iZfZdT8KlfZMVLQcYmo6EooIdsSGrpO/ojwT9Ft1GQI=";
|
vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
modRoot = "cmd/snippetexpandergui";
|
modRoot = "cmd/snippetexpandergui";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
|
||||||
wails
|
wails
|
||||||
scdoc
|
scdoc
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
xorg.libX11
|
xorg.libX11
|
||||||
gtk3
|
gtk3
|
||||||
webkitgtk
|
webkitgtk
|
||||||
gsettings-desktop-schemas
|
|
||||||
snippetexpanderd
|
snippetexpanderd
|
||||||
|
snippetexpanderx
|
||||||
];
|
];
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
"-X 'main.version=${src.rev}'"
|
||||||
];
|
];
|
||||||
|
|
||||||
tags = [
|
tags = [
|
||||||
|
@ -54,17 +56,19 @@ buildGoModule rec {
|
||||||
installManPage snippetexpandergui.1
|
installManPage snippetexpandergui.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
preFixup = ''
|
||||||
wrapProgram $out/bin/snippetexpandergui \
|
gappsWrapperArgs+=(
|
||||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}
|
# Ensure snippetexpanderd and snippetexpanderx are available to start/stop.
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ snippetexpanderd snippetexpanderx ]}
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Your little expandable text snippet helper GUI";
|
description = "Your little expandable text snippet helper GUI";
|
||||||
homepage = "https://snippetexpander.org";
|
homepage = "https://snippetexpander.org";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ ianmjones ];
|
maintainers = with lib.maintainers; [ ianmjones ];
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
mainProgram = "snippetexpandergui";
|
mainProgram = "snippetexpandergui";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
|
||||||
snippetexpanderd
|
snippetexpanderd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
makeFlags = [ "VERSION=${src.rev}" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
@ -53,12 +55,12 @@ stdenv.mkDerivation rec {
|
||||||
# There are no tests.
|
# There are no tests.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Your little expandable text snippet helper auto expander daemon";
|
description = "Your little expandable text snippet helper auto expander daemon";
|
||||||
homepage = "https://snippetexpander.org";
|
homepage = "https://snippetexpander.org";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ ianmjones ];
|
maintainers = with lib.maintainers; [ ianmjones ];
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
mainProgram = "snippetexpanderx";
|
mainProgram = "snippetexpanderx";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user