-
-
Notifications
You must be signed in to change notification settings - Fork 142
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
add: ly-git
#6972
Draft
villamorrd
wants to merge
7
commits into
pacstall:master
Choose a base branch
from
villamorrd:ly-git
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+129
−0
Draft
add: ly-git
#6972
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a998e3d
add: `ly-git`
villamorrd b90193a
fix(ly-git): add `systemd` dep
villamorrd 28d6de5
fix(ly-git): apply pam_path fix
villamorrd c090cec
fix(ly-git): apply new patch
villamorrd 31aa32b
fix(ly-git): install with systemd
villamorrd 25fd6ce
upd(ly-git): Inform user that `ly` is enabled
villamorrd b144a88
upd(ly-git): let user enable `ly` instead
villamorrd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -330,6 +330,7 @@ lunacy-deb | |
lunarclient-app | ||
lutris-deb | ||
lutris-git | ||
ly-git | ||
lyrebird-git | ||
lyx | ||
mailspring-deb | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
pkgbase = ly-git | ||
gives = ly | ||
pkgver = 1.0.2 | ||
pkgdesc = TUI display manager | ||
url = https://github.com/fairyglade/ly | ||
priority = required | ||
arch = any | ||
depends = systemd | ||
makedepends = build-essential | ||
makedepends = libpam0g-dev | ||
makedepends = libxcb-xkb-dev | ||
pacdeps = zig-bin | ||
conflicts = ly | ||
replaces = lightdm | ||
replaces = sddm | ||
license = WTFPL | ||
maintainer = villamorrd <villamorrd@students.nu-moa.edu.ph> | ||
repology = project: ly | ||
source = https://github.com/fairyglade/ly.git | ||
source = config_dir-fix.patch | ||
sha256sums = SKIP | ||
sha256sums = SKIP | ||
|
||
pkgname = ly-git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git a/build.zig b/build.zig | ||
index f0e9074..0fcc2d5 100644 | ||
--- a/build.zig | ||
+++ b/build.zig | ||
@@ -31,7 +31,6 @@ pub fn build(b: *std.Build) !void { | ||
executable_name = b.option([]const u8, "name", "Specify installed executable file name (default is ly)") orelse "ly"; | ||
|
||
const bin_directory = try b.allocator.dupe(u8, config_directory); | ||
- config_directory = try std.fs.path.join(b.allocator, &[_][]const u8{ dest_directory, config_directory }); | ||
|
||
const build_options = b.addOptions(); | ||
const version_str = try getVersionStr(b, "ly", ly_version); | ||
@@ -222,15 +221,15 @@ pub fn ServiceInstaller(comptime init_system: InitSystem) type { | ||
} | ||
|
||
fn install_ly(allocator: std.mem.Allocator, install_config: bool) !void { | ||
- const ly_config_directory = try std.fs.path.join(allocator, &[_][]const u8{ config_directory, "/ly" }); | ||
+ const ly_config_directory = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/ly" }); | ||
|
||
std.fs.cwd().makePath(ly_config_directory) catch { | ||
std.debug.print("warn: {s} already exists as a directory.\n", .{ly_config_directory}); | ||
}; | ||
|
||
- const ly_lang_path = try std.fs.path.join(allocator, &[_][]const u8{ config_directory, "/ly/lang" }); | ||
+ const ly_lang_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/ly/lang" }); | ||
std.fs.cwd().makePath(ly_lang_path) catch { | ||
- std.debug.print("warn: {s} already exists as a directory.\n", .{config_directory}); | ||
+ std.debug.print("warn: {s} already exists as a directory.\n", .{ ly_lang_path }); | ||
}; | ||
|
||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
pkgname=("ly-git") | ||
repology=("project: ly") | ||
arch=('any') | ||
pkgver="1.0.2" | ||
url='https://github.com/fairyglade/ly' | ||
source=( | ||
"https://github.com/fairyglade/ly.git" | ||
"config_dir-fix.patch" | ||
) | ||
sha256sums=( | ||
'SKIP' | ||
'SKIP' | ||
) | ||
depends=("systemd") | ||
makedepends=("build-essential" "libpam0g-dev" "libxcb-xkb-dev") | ||
pacdeps=("zig-bin") | ||
gives="ly" | ||
conflicts=("${gives}") | ||
replaces=("lightdm" "sddm") | ||
pkgdesc="TUI display manager" | ||
priority='required' | ||
maintainer=("villamorrd <villamorrd@students.nu-moa.edu.ph>") | ||
license=('WTFPL') | ||
external_connection=true | ||
|
||
prepare() { | ||
mkdir -p "${pkgdir}/usr" | ||
mkdir -p "${pkgdir}/etc" | ||
} | ||
|
||
build() { | ||
cd "ly" | ||
|
||
# Without this patch, the config directory is set as ${pkgdir}/ly-git/etc when it should be /etc/ly-git | ||
patch build.zig "${srcdir}"/config_dir-fix.patch | ||
|
||
zig build | ||
} | ||
|
||
package() { | ||
cd "ly" | ||
zig build -Ddest_directory="${pkgdir}" installsystemd | ||
} | ||
|
||
post_install() { | ||
systemctl enable ly.service | ||
systemctl disable getty@tty2.service | ||
} | ||
villamorrd marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Who made this patch file, and also can this be put outside the repository?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wrote the patch after investigating a problem with how it creates the configuration files which occurs when changing the install destination folder.
I'm not sure where else to put this patch file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue is that this is a git package and you have a build patch, which while it may work right now, could fail in the future when upstream decides to change something in build.zig.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense. I'll instead submit a pacscript for the stable release in the meantime while I try to get the patch merged upstream for now.