Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a3609f58c7
|
|||
| 6331a7c8ec | |||
| 5ae28029ef | |||
| 142a4e46cb |
@@ -116,12 +116,12 @@
|
|||||||
"name": null,
|
"name": null,
|
||||||
"owner": "Slush97",
|
"owner": "Slush97",
|
||||||
"repo": "grimoire",
|
"repo": "grimoire",
|
||||||
"rev": "v1.14.2",
|
"rev": "v1.23.0",
|
||||||
"sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
|
"sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=",
|
||||||
"sparseCheckout": [],
|
"sparseCheckout": [],
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"version": "v1.14.2"
|
"version": "v1.23.0"
|
||||||
},
|
},
|
||||||
"neovide": {
|
"neovide": {
|
||||||
"cargoLock": {
|
"cargoLock": {
|
||||||
|
|||||||
@@ -69,13 +69,13 @@
|
|||||||
};
|
};
|
||||||
grimoire = {
|
grimoire = {
|
||||||
pname = "grimoire";
|
pname = "grimoire";
|
||||||
version = "v1.14.2";
|
version = "v1.23.0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Slush97";
|
owner = "Slush97";
|
||||||
repo = "grimoire";
|
repo = "grimoire";
|
||||||
rev = "v1.14.2";
|
rev = "v1.23.0";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
|
sha256 = "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
neovide = {
|
neovide = {
|
||||||
|
|||||||
@@ -14,6 +14,8 @@
|
|||||||
vpkmerge,
|
vpkmerge,
|
||||||
sqlite,
|
sqlite,
|
||||||
callPackage,
|
callPackage,
|
||||||
|
makeDesktopItem,
|
||||||
|
copyDesktopItems,
|
||||||
}: let
|
}: let
|
||||||
sources = callPackage ../../../../_sources/generated.nix {};
|
sources = callPackage ../../../../_sources/generated.nix {};
|
||||||
|
|
||||||
@@ -32,7 +34,15 @@
|
|||||||
pname = "grimoire";
|
pname = "grimoire";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
fetcherVersion = 3;
|
fetcherVersion = 3;
|
||||||
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
|
hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
|
||||||
|
};
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = "grimoire";
|
||||||
|
exec = "grimoire %u";
|
||||||
|
desktopName = "Grimoire";
|
||||||
|
categories = ["Utility"];
|
||||||
|
mimeTypes = ["x-scheme-handler/grimoire"];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@@ -49,8 +59,11 @@ in
|
|||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
makeWrapper
|
||||||
electron_40
|
electron_40
|
||||||
|
copyDesktopItems
|
||||||
];
|
];
|
||||||
|
|
||||||
|
desktopItems = [desktopItem];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
sqlite
|
sqlite
|
||||||
];
|
];
|
||||||
@@ -96,21 +109,21 @@ in
|
|||||||
mkdir -p $out/lib/grimoire/resources
|
mkdir -p $out/lib/grimoire/resources
|
||||||
cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
|
cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
|
||||||
echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
|
echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
|
||||||
> $out/lib/grimoire/package.json
|
> $out/lib/grimoire/package.json
|
||||||
|
|
||||||
cp -r node_modules $out/lib/grimoire/node_modules
|
cp -r node_modules $out/lib/grimoire/node_modules
|
||||||
|
|
||||||
rm -rf "$out/lib/grimoire/node_modules/@grimoire"
|
rm -rf "$out/lib/grimoire/node_modules/@grimoire"
|
||||||
|
|
||||||
find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
|
find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
|
||||||
[ -e "$link" ] || rm -f "$link"
|
[ -e "$link" ] || rm -f "$link"
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
|
makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
|
||||||
--add-flags "$out/lib/grimoire" \
|
--add-flags "$out/lib/grimoire" \
|
||||||
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
|
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
|
||||||
--set NODE_ENV production
|
--set NODE_ENV production
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
|
|||||||
|
|
||||||
rec {
|
rec {
|
||||||
name = "x1e80100-firmware";
|
name = "x1e80100-firmware";
|
||||||
version = "26100_26.033.32430.0";
|
version = "26100_26.053.36539.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# https://www.microsoft.com/en-us/download/details.aspx?id=106120
|
# https://www.microsoft.com/en-us/download/details.aspx?id=106120
|
||||||
url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
|
url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
|
||||||
hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
|
hash = "sha256-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
msitools
|
msitools
|
||||||
|
|||||||
Reference in New Issue
Block a user