summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-04-25 15:52:09 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-04-25 15:53:26 +0200
commit0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc (patch)
tree164f99131b4ed4af2a2399c55dd850c6aff2968f /pkgs/desktops/gnome-2/default.nix
parent4d40adb86d03b856e12984048ced8902e3f73fd3 (diff)
downloadnixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.gz
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.bz2
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.lz
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.xz
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.zst
nixpkgs-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.zip
rarian: merge gnome{2,3}.rarian
Diffstat (limited to 'pkgs/desktops/gnome-2/default.nix')
-rw-r--r--pkgs/desktops/gnome-2/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index cc453678525..80f2c9ce70d 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian
 , libstartup_notification, overrides ? {} }:
 
 let overridden = set // overrides; set = with overridden; {
@@ -14,6 +14,7 @@ let overridden = set // overrides; set = with overridden; {
   gnome_desktop = gnome-desktop;
   gnome_settings_daemon = gnome-settings-daemon;
   gnome_control_center = gnome-control-center;
+  inherit rarian;
 
 #### PLATFORM
 
@@ -93,9 +94,6 @@ let overridden = set // overrides; set = with overridden; {
   # Removed from recent GNOME releases, but still required
   scrollkeeper = callPackage ./desktop/scrollkeeper { };
 
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
   zenity = callPackage ./desktop/zenity { };
 
   metacity = callPackage ./desktop/metacity { };