about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-02-20 22:27:33 +0000
committerRobin Gloster <mail@glob.in>2016-02-20 22:27:33 +0000
commit4036e9ba8cd8aa450e27541daa31d490a4e79d38 (patch)
treecdfaf300d05204afb4b51bcd58dc4350d2b42d5a /pkgs/servers
parent8641b9dec4d6d66c7414f4c64f38e70be89b2af7 (diff)
parent3e7e8e88078b6e73b7b72aa64efd87bf4feedc2c (diff)
downloadnixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.gz
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.bz2
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.lz
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.xz
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.zst
nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.zip
Merge branch 'up' into hardened-stdenv
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/mqtt/mosquitto/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 4fdb475d89b8..0dacaf4cfe47 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -13,11 +13,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libuuid ];
 
-  buildFlags = "mosquitto";
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/mosquitto $out/bin/
+  preBuild = ''
+    substituteInPlace config.mk \
+      --replace "/usr/local" ""
   '';
 
   meta = {