diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-23 02:22:52 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-23 02:59:33 +0200 |
| commit | c241e9756bf80ca7f672925e2d83ec7746ee80af (patch) | |
| tree | ab73a6bde35be7a52dfb3ec139e1fa27d8e21455 | |
| parent | b8ba71d6333cdb38220aa0ea6150c7f393de0898 (diff) | |
| download | nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar.gz nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar.bz2 nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar.lz nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar.xz nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.tar.zst nixpkgs-c241e9756bf80ca7f672925e2d83ec7746ee80af.zip | |
gnome-photos: move from gnome3
| -rw-r--r-- | pkgs/applications/graphics/gnome-photos/default.nix (renamed from pkgs/desktops/gnome-3/apps/gnome-photos/default.nix) | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 7080e724c1d..e6072b1211d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 4f78efc8bc2..7820c32e2a6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -37,7 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan gnome-terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweaks gnome-photos + gnome-clocks gnome-music gnome-tweaks pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software @@ -241,10 +241,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-notes = callPackage ./apps/gnome-notes { }; - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_4; - }; - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; @@ -381,7 +377,7 @@ lib.makeScope pkgs.newScope (self: with self; { 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 - inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners; # added 2019-08-23 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5052ed872b..7c341a69d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3408,6 +3408,10 @@ in gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { + gegl = gnome3.gegl_0_4; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; |