adding gis system grass (graphviz 3d is not supported yet)

svn path=/nixpkgs/trunk/; revision=22131
2010-06-03 15:19:59 +00:00
parent d3be228d96
commit d3341315bd
3 changed files with 204 additions and 6 deletions
--- a/pkgs/lib/composable-derivation.nix
+++ b/pkgs/lib/composable-derivation.nix
@@ -42,11 +42,13 @@ let inherit (lib) nv nvs; in
  # W ith or W ithout F eature
  wwf = {name, feat ? name, enable ? {}, disable ? {}, value ? ""}:
    nvs name {
-    set = {
-      configureFlags = ["--with-${feat}${if value == "" then "" else "="}${value}"];
-    } // enable;
-    unset = {
-      configureFlags = ["--without-${feat}"];
-    } // disable;
+    set = enable // {
+      configureFlags = ["--with-${feat}${if value == "" then "" else "="}${value}"]
+                       ++ lib.maybeAttr "configureFlags" [] enable;
+    };
+    unset = disable // {
+      configureFlags = ["--without-${feat}"]
+                       ++ lib.maybeAttr "configureFlags" [] disable;
+    };
  };
 }