diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
| commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
| tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/desktops/xfce | |
| parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
| parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) | |
| download | nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.gz nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.bz2 nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.lz nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.xz nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.zst nixpkgs-09af15654f0c8091f1b9e0bbb2e523cdee194442.zip | |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/desktops/xfce')
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 944e9ba013d..9453e85d253 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -14,7 +14,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### NixOS support - inherit (pkgs) gvfs; + gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc"; #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index 420eb128a42..ff4e89a23cf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -5,8 +5,8 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; ver_maj = "1.5"; - ver_min = "1"; - rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8"; + ver_min = "2"; + rev = "d08418c8d55edfacef190ec14e03e1e9a6988101"; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -14,15 +14,20 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; inherit rev; - sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76"; + sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx"; }; buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; + preFixup = '' + substituteInPlace $out/bin/xfce4-popup-whiskermenu \ + --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel + ''; + meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Whisker Menu is an alternate application launcher for Xfce."; + description = "Whisker Menu is an alternate application launcher for Xfce"; platforms = platforms.linux; maintainers = [ maintainers.pjbarnoy ]; }; |