From cd0d3f8bf202544ed35d1ec0d5d494a2fb1e6226 Mon Sep 17 00:00:00 2001 From: Seven Of Aces Date: Sun, 25 Aug 2024 13:34:50 -0700 Subject: [PATCH] modified: hosts/shared/nixos/shared_config.nix modified: pkgs/default.nix deleted: pkgs/wallpaper-engine.nix --- hosts/shared/nixos/shared_config.nix | 2 +- pkgs/default.nix | 2 +- pkgs/wallpaper-engine.nix | 44 ---------------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 pkgs/wallpaper-engine.nix diff --git a/hosts/shared/nixos/shared_config.nix b/hosts/shared/nixos/shared_config.nix index 7b58394..cfb4aee 100644 --- a/hosts/shared/nixos/shared_config.nix +++ b/hosts/shared/nixos/shared_config.nix @@ -8,7 +8,7 @@ }: { environment.systemPackages = with pkgs; [ steam - wallpaper_engine + # code cargo rustc # Rust jetbrains.pycharm-professional diff --git a/pkgs/default.nix b/pkgs/default.nix index 2bda00e..02214a6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,5 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { };; - wallpaper_engine = pkgs.callPackage ./wallpaper-engine {}; + wallpaper_engine = pkgs.callPackage ./wallpaper-engine.nix {}; } \ No newline at end of file diff --git a/pkgs/wallpaper-engine.nix b/pkgs/wallpaper-engine.nix deleted file mode 100644 index 3388f0d..0000000 --- a/pkgs/wallpaper-engine.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ mkDerivation -, fetchFromGitHub -, cmake -, extra-cmake-modules -, plasma-framework -, gst-libav -, mpv -, websockets -, qtwebsockets -, qtwebchannel -, qtdeclarative -, qtx11extras -, vulkan-headers -, vulkan-loader -, vulkan-tools -, pkg-config -, lz4 -, glslang -}: - -mkDerivation rec { - pname = "wallpaper-engine-kde-plugin"; - version = "0.5.3"; - - cmakeFlags = [ "-DUSE_PLASMAPKG=ON" ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; - buildInputs = [ - plasma-framework mpv qtwebsockets websockets qtwebchannel - qtdeclarative qtx11extras lz4 - vulkan-headers vulkan-tools vulkan-loader - ]; - - postPatch = '' - rmdir src/backend_scene/third_party/glslang - ln -s ${glslang.src} src/backend_scene/third_party/glslang - ''; - - src = fetchFromGitHub { - owner = "catsout"; - repo = pname; - rev = "v${version}"; - sha256 = "qmg+g1you3rm1EAfZWRUBBkEQm1QQ0V9/mIn8bBgbu4="; - }; -} \ No newline at end of file