Merge branch 'staging'

Contains security fixes in X server and X libs. On Hydra, the amount to rebuild on master is now higher than on staging; the comparison looks OK.
2017-10-15 13:59:18 +02:00
parent 5a21efdcdf 75e4191739
commit 3ee33f35f8
54 changed files with 180 additions and 221 deletions
@@ -53,10 +53,6 @@ buildGoPackage rec {
    go generate github.com/drone/drone/store/datastore/ddl
  '';

-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-    install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone
-  '';
-
  src = fetchFromGitHub {
    owner = "drone";
    repo = "drone";