nix: Adapt to renaming of buildPerlPackage

[novaboot.git] / default.nix

diff --git a/default.nix b/default.nix
index da915455d7dee84825069d1b610158ea3027a7ae..d1e317a06e616f1f51231437c64977a03521442b 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,11 @@
 {
   nixpkgs ? <nixpkgs>,
-  pkgs ? import nixpkgs {}
+  pkgs ? import nixpkgs {},
+  otherPerlPackages ? []
 }:
 with pkgs;
 let
-  IO-Stty = buildPerlPackage {
+  IO-Stty = perlPackages.buildPerlPackage {
     pname = "IO-Stty";
     version = "0.04";
     src = fetchurl {
@@ -12,13 +13,24 @@ let
       sha256 = "1hjicqy50mgbippn310k4zclr9ksz05yyg81za3q4gb9m3qhk5aw";
     };
   };
-  perlEnv = (perl.withPackages (p: [ p.Expect IO-Stty ]));
+  perlEnv = (perl.withPackages (p: [ p.Expect IO-Stty ] ++ otherPerlPackages));
 in
-stdenv.mkDerivation {
-  name = "novaboot";
-  src = builtins.fetchGit { url = ./.; };
-  buildInputs = [ perlEnv rsync ];
-  installPhase = ''
+{
+  novaboot = stdenv.mkDerivation {
+    name = "novaboot";
+    src = builtins.fetchGit { url = ./.; };
+    buildInputs = [ perlEnv rsync ];
+    installPhase = ''
     make install DESTDIR=$out PREFIX=
   '';
+  };
+  novaboot-server = stdenv.mkDerivation {
+    name = "novaboot-server";
+    src = builtins.fetchGit { url = ./.; };
+    nativeBuildInputs = [ perl ];
+    buildInputs = [ rsync ];
+    installPhase = ''
+    make -C server install DESTDIR=$out PREFIX=
+  '';
+  };
 }