From 189f39e774c0924b0307955356f9c8322281db58 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sun, 29 Dec 2024 20:10:55 +0100 Subject: [PATCH] workrave: migrate to pkgs/by-name --- .../wo/workrave/package.nix} | 14 ++++++-------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 6 insertions(+), 13 deletions(-) rename pkgs/{applications/misc/workrave/default.nix => by-name/wo/workrave/package.nix} (92%) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/by-name/wo/workrave/package.nix similarity index 92% rename from pkgs/applications/misc/workrave/default.nix rename to pkgs/by-name/wo/workrave/package.nix index 5a0f4cd51acf..d885d579cd7b 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -26,12 +26,10 @@ dbus, dbus-glib, gdome2, - gstreamer, - gst-plugins-base, - gst-plugins-good, + gst_all_1, libsigcxx, boost, - jinja2, + python3Packages, }: stdenv.mkDerivation rec { @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { libtool pkg-config wrapGAppsHook3 - jinja2 + python3Packages.jinja2 gobject-introspection ]; @@ -74,9 +72,9 @@ stdenv.mkDerivation rec { dbus dbus-glib gdome2 - gstreamer - gst-plugins-base - gst-plugins-good + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good libsigcxx boost ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d42a1fdc98..f2036862232f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15986,11 +15986,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - workrave = callPackage ../applications/misc/workrave { - inherit (python3Packages) jinja2; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; - worldengine-cli = python3Packages.worldengine; wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice { };