From d4861c9edeeb7860bdee16cd73a01ea291d436d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 19 Aug 2019 15:37:17 +0200 Subject: [PATCH] gnome-video-effects: move from gnome3.gnome-video-effects --- pkgs/desktops/gnome-3/default.nix | 4 ++-- .../libraries}/gnome-video-effects/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/{desktops/gnome-3/misc => development/libraries}/gnome-video-effects/default.nix (95%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 87b7be5bdd2f..5a6dad2a7945 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -351,8 +351,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-autoar = callPackage ./misc/gnome-autoar { }; - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; } // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases @@ -392,6 +390,8 @@ lib.makeScope pkgs.newScope (self: with self; { easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 + inherit (pkgs) gnome-video-effects; # added 2019-08-19 + defaultIconTheme = adwaita-icon-theme; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix rename to pkgs/development/libraries/gnome-video-effects/default.nix index b65e9c1021e7..cb319c125848 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -15,7 +15,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2091d2b6f86e..1afdda3af867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9459,6 +9459,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4;