macronova/nix-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update flake

Browse source
This commit is contained in:
Invariantspace 2024-09-28 13:42:39 -07:00
parent 246483e3d9
commit 19d0f83427
No known key found for this signature in database
GPG key ID: EBC4A20067373921
4 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

47
flake.lock generated
View file

@ -3,11 +3,11 @@
"candy-icons": { "candy-icons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724623392, "lastModified": 1726614797,
"narHash": "sha256-0wsSjK8WrwM/yh40a76cYblbv52tdJGTKAdxNU43frc=", "narHash": "sha256-ObZ4ZKPOoGnhLrAqGMYfuTEE/Yz9mKoVA7YqiIkTAXs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b92b133d0ad7ed5b5e376bd00216a05652277209", "rev": "840155dba4b29a57ad16e9687eaeda40c5f849c1",
"revCount": 1217, "revCount": 1221,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/candy-icons" "url": "https://github.com/EliverLara/candy-icons"
}, },
@ -21,11 +21,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1727348695,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"sweet-ambar-blue": { "sweet-ambar-blue": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725663625, "lastModified": 1727118470,
"narHash": "sha256-H6TEFHxGK/W39eR95v6dwBu7XyzsvajpD/Vn28fc0aI=", "narHash": "sha256-C+xUbMvUIn5jjg5EEaLQ89e1ZA6exqlXAbCBsLKy64k=",
"ref": "Ambar-Blue", "ref": "Ambar-Blue",
"rev": "2a5fc9cb672ecfd1f2a6f1f1d289a665891336f0", "rev": "9fe9dc3729a5db47c3d4902a323a017278e77d4d",
"revCount": 297, "revCount": 298,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/Sweet" "url": "https://github.com/EliverLara/Sweet"
}, },
@ -84,11 +84,11 @@
"sweet-ambar-blue-dark": { "sweet-ambar-blue-dark": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725663779, "lastModified": 1727118517,
"narHash": "sha256-ffQGwPhXHOZDhC/F1Enj0zMzbaXRkVbUkok3KfWZycY=", "narHash": "sha256-ZiXDYD3kxvOM/Ijjim2dLR+3ATOQI9PMXLfPlAbltqo=",
"ref": "Ambar-Blue-Dark", "ref": "Ambar-Blue-Dark",
"rev": "ea071eb2979cd2bc5f9f2a352ab8534279d3c77e", "rev": "478142d5e427d314220037e76dc61bc197d74e5b",
"revCount": 381, "revCount": 382,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/Sweet" "url": "https://github.com/EliverLara/Sweet"
}, },
@ -149,17 +149,16 @@
"wallpaper-engine-plasma6-plugin": { "wallpaper-engine-plasma6-plugin": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718553568, "lastModified": 1726816409,
"narHash": "sha256-bKGQxyS8gUi+37lODLVHphMoQwLKZt/hpSjR5MN+5GA=", "narHash": "sha256-KFTYZM82tQOQ+EKcPZPcsv0I9opqR2ahUTFjeKXmcVc=",
"ref": "qt6", "ref": "refs/heads/main",
"rev": "1e604105c586c7938c5b2c19e3dc8677b2eb4bb4", "rev": "066813c4309faf1a86b5bc54bdaa69b4d7e511ed",
"revCount": 608, "revCount": 626,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin" "url": "https://github.com/catsout/wallpaper-engine-kde-plugin"
}, },
"original": { "original": {
"ref": "qt6",
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin" "url": "https://github.com/catsout/wallpaper-engine-kde-plugin"

2
flake.nix
View file

@ -26,7 +26,7 @@
}; };
wallpaper-engine-plasma6-plugin = { wallpaper-engine-plasma6-plugin = {
flake = false; flake = false;
url = "git+https://github.com/catsout/wallpaper-engine-kde-plugin?ref=qt6&submodules=1"; url = "git+https://github.com/catsout/wallpaper-engine-kde-plugin?&submodules=1";
}; };
yorha-grub-theme = { yorha-grub-theme = {
flake = false; flake = false;

2
packages/wallpaper-engine-plasma6-plugin.nix
View file

@ -46,7 +46,7 @@ pkgs.kdePackages.callPackage (
lib.makeSearchPath "lib/qt-6/qml" [ lib.makeSearchPath "lib/qt-6/qml" [
qtmultimedia qtmultimedia
qtwebchannel qtwebchannel
qtwebengine qtwebengine.dev
qtwebsockets qtwebsockets
] ]
}" }"

8
packages/wallpaper-engine-plasma6-plugin.patch
View file

@ -14,7 +14,7 @@ diff --git a/plugin/contents/pyext.py b/plugin/contents/pyext.py
old mode 100644 old mode 100644
new mode 100755 new mode 100755
diff --git a/plugin/contents/ui/Pyext.qml b/plugin/contents/ui/Pyext.qml diff --git a/plugin/contents/ui/Pyext.qml b/plugin/contents/ui/Pyext.qml
index 1a48f5e..8a9c9c9 100644 index 1a48f5e..7db2480 100644
--- a/plugin/contents/ui/Pyext.qml --- a/plugin/contents/ui/Pyext.qml
+++ b/plugin/contents/ui/Pyext.qml +++ b/plugin/contents/ui/Pyext.qml
@@ -15,7 +15,8 @@ Item { @@ -15,7 +15,8 @@ Item {
@ -22,16 +22,16 @@ index 1a48f5e..8a9c9c9 100644
"[ -f \"$HOME/.local/share/$EXT\" ] && WKD=\"$HOME/.local/share/$EXT\"", "[ -f \"$HOME/.local/share/$EXT\" ] && WKD=\"$HOME/.local/share/$EXT\"",
"[ -f \"$XDG_DATA_HOME/$EXT\" ] && WKD=\"$XDG_DATA_HOME/$EXT\"", "[ -f \"$XDG_DATA_HOME/$EXT\" ] && WKD=\"$XDG_DATA_HOME/$EXT\"",
- `exec python3 "$WKD" "${ws_server.url}"` - `exec python3 "$WKD" "${ws_server.url}"`
+ "[ -f \"NIX_STORE_PACKAGE_PATH/share/$EXT\" ] && WKD=\"NIX_STORE_PACKAGE_PATH/share/$EXT\"", + "[ -f \"NIX_STORE_PACKAGE_PATH/share/$EXT\" ] && WKD=\"NIX_STORE_PACKAGE_PATH/share/$EXT\"",
+ `"$WKD" "${ws_server.url}"` + `"$WKD" "${ws_server.url}"`
].join("\n"); ].join("\n");
return sh; return sh;
} }
diff --git a/src/plugin.cpp b/src/plugin.cpp diff --git a/src/plugin.cpp b/src/plugin.cpp
index 5e8a7e2..1709a27 100644 index 4bc817e..2fa88a3 100644
--- a/src/plugin.cpp --- a/src/plugin.cpp
+++ b/src/plugin.cpp +++ b/src/plugin.cpp
@@ -13,6 +13,18 @@ class Port : public QQmlExtensionPlugin { @@ -14,6 +14,18 @@ class Port : public QQmlExtensionPlugin {
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public: public: