surveyor: clean up build

Author: nmattia

infra/surveyor/Makefile

@@ -1,2 +1,8 @@
+PREFIX = /usr/lib/surveyor
+
 surveyor.so: surveyor.c
 	gcc -Wall -nostartfiles -fpic -shared surveyor.c -o surveyor.so -ldl -D_GNU_SOURCE
+
+install: surveyor.so
+	install -d $(PREFIX)/lib/
+	install -m 644 surveyor.so $(PREFIX)/lib/

infra/surveyor/default.nix

@@ -1,7 +1,18 @@
-let pkgs = import ./nix {}; in
+{ pkgs ? import ./nix {} }:
 
 with rec
 {
+  surveyor-source = pkgs.lib.sourceByRegex ./.
+    [ "^Makefile$"
+      "^surveyor.c"
+    ];
+
+  surveyor = pkgs.stdenv.mkDerivation
+    { name = "surveyor";
+      src = surveyor-source;
+      preConfigure = ''makeFlags="$makeFlags PREFIX=$out"'';
+    };
+
   runTest = test: pkgs.runCommand "test"
     { buildInputs = [ pkgs.netcat pkgs.curl pkgs.haskellPackages.wai-app-static ] ;}
     (test + "\n" + "touch $out");
@@ -39,7 +50,7 @@ let tests =
       ${runPort 1234}
 
       SRV_MAP="*:80:*:1234" \
-        LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so" \
+        LD_PRELOAD="${surveyor}/lib/surveyor.so" \
          curl localhost | grep -q '1234'
     '';
 
@@ -49,7 +60,7 @@ let tests =
       ${runPort 1234}
 
       SRV_MAP="192.168.42.42:*:127.0.0.1:*" \
-        LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so" \
+        LD_PRELOAD="${surveyor}/lib/surveyor.so" \
          curl 192.168.42.42:1234 | grep -q '1234'
     '';
 
@@ -62,9 +73,9 @@ let tests =
 
       export SRV_MAP="*:1234:*:1235 *:1235:*:1234"
 
-      LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so" \
+      LD_PRELOAD="${surveyor}/lib/surveyor.so" \
           curl localhost:1234 | grep -q '1235'
-      LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so" \
+      LD_PRELOAD="${surveyor}/lib/surveyor.so" \
           curl localhost:1235 | grep -q '1234'
     '';
 
@@ -80,13 +91,12 @@ let tests =
         [["0.0.0.42" "www.example.com"] ["0.0.0.43" "does.not.exist"]]}
 
 
-      LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so ${pkgs.libredirect}/lib/libredirect.so" \
+      LD_PRELOAD="${surveyor}/lib/surveyor.so ${pkgs.libredirect}/lib/libredirect.so" \
           curl www.example.com | grep -q '1234'
-      LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so ${pkgs.libredirect}/lib/libredirect.so" \
+      LD_PRELOAD="${surveyor}/lib/surveyor.so ${pkgs.libredirect}/lib/libredirect.so" \
           curl does.not.exist | grep -q '1235'
     '';
 }; in
 
-{ inherit (pkgs) surveyor;
-  inherit test_portMap;
+{ inherit surveyor;
 } // (builtins.mapAttrs (k: v: runTest v) tests)

infra/surveyor/nix/default.nix

@@ -1,16 +1,4 @@
 { sources ? import ./sources.nix }:
-with
-  { overlay = _: pkgs:
-      { inherit (import sources.niv {}) niv;
-        surveyor = pkgs.stdenv.mkDerivation
-        { name = "surveyor";
-          src = pkgs.lib.sourceByRegex ../.
-            [ "^Makefile$"
-              "^surveyor.c"
-            ];
-          installPhase = "mkdir -p $out/lib && cp surveyor.so $out/lib";
-          } ;
-      };
-  };
+with { overlay = _: pkgs: { inherit (import sources.niv {}) niv; }; };
 import sources.nixpkgs
   { overlays = [ overlay ] ; config = {}; }