diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-22 01:22:05 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-22 01:22:05 +0000 |
| commit | eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f (patch) | |
| tree | 007ebd133fbc4cb2da799da9489b0144de233de6 /pkgs | |
| parent | bb2639aafc021cf8a86af51de98623278f5d5e98 (diff) | |
| parent | 60290c69e49c72416677dd394a757fc688df5e0e (diff) | |
| download | nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar.gz nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar.bz2 nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar.lz nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar.xz nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.tar.zst nixlib-eb93a9ca0a2a9f3a874a3fafe08f056c84e0376f.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index bb77f5687357..3c76a87cbe3a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { 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."; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 73e92aa4b8e5..a6aed5169c8b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -16,8 +16,8 @@ let }; gssapiSrc = fetchpatch { - url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/6.9p1-3"; - sha256 = "03zlgkb3a1igj20kn8cz55ggaxg65h6f0kg20m39m0wsb94qjdb1"; + url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2"; + sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm"; }; in |