From 735f0f2ca8b9da0791554a6335f2f0b1238ffad8 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 23 Sep 2015 19:12:36 +0200 Subject: thunar-dropbox-plugin: fixup after #9935 Close #9935. I don't think it's good to split thunarx into a separate derivation in this way. We would have the library and associated stuff twice and two expressions, etc. Distributions do these things by an analogy to multiple-output derivation (Debian does, for example), so we could use that, but it doesn't seem important in this case and would be better after #7701 anyway. --- pkgs/desktops/xfce/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops/xfce/default.nix') diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f348c98e803a..a9903c941bfe 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -25,11 +25,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfce4util = callPackage ./core/libxfce4util.nix { }; libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; - thunarx-2-dev = callPackage ./core/thunarx-2-dev.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; - thunar-dropbox-plugin - = callPackage ./thunar-plugins/dropbox { }; + thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; -- cgit 1.4.1