JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster 2016-02-22 01:22:05 +00:00
commit eb93a9ca0a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
View File

@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
gtk exo garcon ]; gtk exo garcon ];
preFixup = ''
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
--replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel
'';
meta = { meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; 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.";

4
pkgs/tools/networking/openssh/default.nix
View File

@ -16,8 +16,8 @@ let
}; };
gssapiSrc = fetchpatch { gssapiSrc = fetchpatch {
url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/6.9p1-3"; url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2";
sha256 = "03zlgkb3a1igj20kn8cz55ggaxg65h6f0kg20m39m0wsb94qjdb1"; sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm";
}; };
in in