diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
| commit | 3e387c3e005c87566b5403d24c86f71f4945a79b (patch) | |
| tree | 6ddd883a2e405850093d1f19cd18bb9b712e7c01 /pkgs/servers/monitoring | |
| parent | df8958435e1fd0c6d55394e95d3d3d2e0edca474 (diff) | |
| parent | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (diff) | |
| download | nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.gz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.bz2 nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.lz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.xz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.zst nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.zip | |
Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/longview/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 9436f4bf300f..fd8a009b1670 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -11,15 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02"; }; - patches = - [ # log to systemd journal - ./log-stdout.patch - ]; + patches = [ + # log to systemd journal + ./log-stdout.patch + ]; - postPatch = - '' - substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid - ''; + postPatch = '' + substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid + ''; buildInputs = [ perl makeWrapper glibc ] ++ (with perlPackages; [ @@ -37,7 +36,8 @@ stdenv.mkDerivation rec { DBDmysql ]); - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p $out/bin $out/usr mv Linode $out |