feat(pam-grosshack): use latest release instead of latest git
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
f12e7f2513
commit
e7e04fa569
6 changed files with 52 additions and 48 deletions
|
@ -67,6 +67,10 @@ const main = async() => {
|
|||
console.log(await updateNodeModules());
|
||||
}
|
||||
|
||||
if (args['p'] || args['pam-fprint-grosshack']) {
|
||||
console.log(runNixUpdate('pam-fprint-grosshack'));
|
||||
}
|
||||
|
||||
if (args['s'] || args['some-sass-language-server']) {
|
||||
console.log(updateCustomPackage('some-sass-language-server'));
|
||||
}
|
||||
|
@ -129,6 +133,7 @@ const main = async() => {
|
|||
|
||||
updatePackage('homepage');
|
||||
updatePackage('jmusicbot');
|
||||
updatePackage('pam-fprint-grosshack');
|
||||
|
||||
|
||||
spawnSync('nixFastBuild', [], {
|
||||
|
|
17
flake.lock
generated
17
flake.lock
generated
|
@ -1517,22 +1517,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pam-fprint-grosshack-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1658952526,
|
||||
"narHash": "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=",
|
||||
"owner": "mishakmak",
|
||||
"repo": "pam-fprint-grosshack",
|
||||
"rev": "45b42524fb5783e1e555067743d7e0f70d27888a",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mishakmak",
|
||||
"repo": "pam-fprint-grosshack",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"pcsd": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -1736,7 +1720,6 @@
|
|||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"nurl": "nurl",
|
||||
"nvim-theme-src": "nvim-theme-src",
|
||||
"pam-fprint-grosshack-src": "pam-fprint-grosshack-src",
|
||||
"pcsd": "pcsd",
|
||||
"piper-src": "piper-src",
|
||||
"poetry2nix": "poetry2nix",
|
||||
|
|
|
@ -381,12 +381,6 @@
|
|||
repo = "dracula.nvim";
|
||||
type = "github";
|
||||
};
|
||||
pam-fprint-grosshack-src = {
|
||||
flake = false;
|
||||
owner = "mishakmak";
|
||||
repo = "pam-fprint-grosshack";
|
||||
type = "gitlab";
|
||||
};
|
||||
pcsd = {
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
@ -340,11 +340,6 @@ let
|
|||
owner = "rogs";
|
||||
repo = "subscleaner";
|
||||
}
|
||||
{
|
||||
type = "gitlab";
|
||||
owner = "mishakmak";
|
||||
repo = "pam-fprint-grosshack";
|
||||
}
|
||||
{
|
||||
type = "gitlab";
|
||||
owner = "phoneybadger";
|
||||
|
|
|
@ -2,43 +2,68 @@
|
|||
# nix build inputs
|
||||
lib,
|
||||
stdenv,
|
||||
pam-fprint-grosshack-src,
|
||||
fetchFromGitLab,
|
||||
# deps
|
||||
dbus,
|
||||
glib,
|
||||
libfprint,
|
||||
libpam-wrapper,
|
||||
libxml2,
|
||||
libxslt,
|
||||
meson,
|
||||
ninja,
|
||||
pam,
|
||||
perl,
|
||||
pkg-config,
|
||||
polkit,
|
||||
python3Packages,
|
||||
systemd,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) elemAt head readFile split;
|
||||
tag = head (split "'" (elemAt (split " version: '" (readFile "${pam-fprint-grosshack-src}/meson.build")) 2));
|
||||
pname = "pam-fprint-grosshack";
|
||||
version = "0.3.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "pam-fprint-grosshack";
|
||||
version = "${tag}+${pam-fprint-grosshack-src.shortRev}";
|
||||
inherit pname version;
|
||||
|
||||
src = pam-fprint-grosshack-src;
|
||||
src = fetchFromGitLab {
|
||||
owner = "mishakmak";
|
||||
repo = "pam-fprint-grosshack";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
|
||||
};
|
||||
|
||||
# Tests aren't actually ran for some reason so I get rid of the warning
|
||||
postPatch = ''
|
||||
substituteInPlace ./meson.build --replace-fail \
|
||||
"'gi.repository.FPrint': true," "'gi.repository.FPrint': false,"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
dbus
|
||||
glib
|
||||
libfprint
|
||||
polkit
|
||||
dbus
|
||||
systemd
|
||||
pam
|
||||
libpam-wrapper
|
||||
libxml2
|
||||
libxslt
|
||||
meson
|
||||
ninja
|
||||
pam
|
||||
perl
|
||||
pkg-config
|
||||
polkit
|
||||
systemd
|
||||
|
||||
python3Packages.python
|
||||
python3Packages.dbus-python
|
||||
python3Packages.pydbus
|
||||
python3Packages.pypamtest
|
||||
python3Packages.python-dbusmock
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Dman=true"
|
||||
"-Dpam_modules_dir=${placeholder "out"}/lib/security"
|
||||
"-Dsysconfdir=${placeholder "out"}/etc"
|
||||
"-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services"
|
||||
|
|
|
@ -30,7 +30,9 @@ in
|
|||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = o.meta // {
|
||||
meta =
|
||||
o.meta
|
||||
// {
|
||||
description = ''
|
||||
${o.meta.description}
|
||||
This derivation overrides the Proton version in Steam so that games using the Proton
|
||||
|
|
Loading…
Add table
Reference in a new issue