Nix expressions: Separate the package function from the composition.

XTLS · Jan 24, 2015 · 1be45b4 · 1be45b4
1 parent 17e5542
commit 1be45b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/badvpn.nix b/badvpn.nix
@@ -0,0 +1,13 @@
+{ stdenv, cmake, pkgconfig, openssl, nspr, nss, debug ? false }:
+let
+    compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}";
+in
+stdenv.mkDerivation {
+    name = "badvpn";
+    nativeBuildInputs = [ cmake pkgconfig ];
+    buildInputs = [ openssl nspr nss ];
+    src = stdenv.lib.cleanSource ./.;
+    preConfigure = ''
+        cmakeFlagsArray=( "-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=${compileFlags}" );
+    '';
+}
diff --git a/build.nix b/build.nix
@@ -1,22 +1,6 @@
-let
-    badvpnLocal = (
-        { stdenv, cmake, pkgconfig, openssl, nspr, nss, debug ? false }:
-        let
-            compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}";
-        in
-        stdenv.mkDerivation {
-            name = "badvpn";
-            nativeBuildInputs = [ cmake pkgconfig ];
-            buildInputs = [ openssl nspr nss ];
-            src = stdenv.lib.cleanSource ./.;
-            preConfigure = ''
-                cmakeFlagsArray=( "-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=${compileFlags}" );
-            '';
-        }
-    );
-in
 with import <nixpkgs> {};
 rec {
-   badvpn = pkgs.callPackage badvpnLocal {};
-   badvpnDebug = pkgs.callPackage badvpnLocal { debug = true; };
+    badvpnFunc = import ./badvpn.nix;
+    badvpn = pkgs.callPackage badvpnFunc {};
+    badvpnDebug = pkgs.callPackage badvpnFunc { debug = true; };
 }