X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=lib%2Fdefault.nix;h=86832d47fa868749d28b4076cf591e42b533bb12;hb=0b3f9cb9fde5929f361e91f6ed5b43958665f3d5;hp=1baee1f53e79cea08a6611fc87a28ead8e247520;hpb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/lib/default.nix b/lib/default.nix
index 1baee1f..86832d4 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -17,7 +17,8 @@ rec {
       json = lib.importJSON path;
     in rec {
       version = json.tag;
-      name = "${json.meta.name}-${version}";
+      pname = json.meta.name;
+      name = "${pname}-${version}";
       src = fetchFromGitHub json.github;
     };
 
@@ -26,7 +27,8 @@ rec {
       json = lib.importJSON path;
     in rec {
       version = json.tag;
-      name = "${json.meta.name}-${version}";
+      pname = json.meta.name;
+      name = "${pname}-${version}";
       src = fetchgit json.git;
     };
 
@@ -35,48 +37,12 @@ rec {
       json = lib.importJSON path;
     in rec {
       version = json.tag;
-      name = "${json.meta.name}-${version}";
+      pname = json.meta.name;
+      name = "${pname}-${version}";
       src = builtins.fetchGit {
         url = json.git.url;
         ref = "master";
         rev = json.git.rev;
       };
     };
-
-  wrap = { paths ? [], vars ? {}, file ? null, script ? null, name ? "wrap" }:
-    assert file != null || script != null ||
-      abort "wrap needs 'file' or 'script' argument";
-    with rec {
-      set  = n: v: "--set ${pkgs.lib.escapeShellArg n} " +
-                    "${pkgs.lib.escapeShellArg v}";
-      args = (map (p: "--prefix PATH : ${p}/bin") paths) ++
-            (builtins.attrValues (pkgs.lib.mapAttrs set vars));
-    };
-    runCommand name
-      {
-        f           = if file == null then writeScript name script else file;
-        buildInputs = [ makeWrapper ];
-      }
-      ''
-        makeWrapper "$f" "$out" ${toString args}
-      '';
-
-  # This adds header colors to the builds, but it rebuilds the whole
-  # world from scratch, so only use it to debug!
-  # add it as postHook in derivations
-  immaePostHook = ''
-    header() {
-      echo -ne "\033[1;36m"
-      echo -n "$1"
-      echo -e "\033[0m"
-    }
-
-    echoCmd() {
-      printf "\033[1;34m%s:\033[0m" "$1"
-      shift
-      printf ' %q' "$@"
-      echo
-    }
-  '';
-
-} // (if builtins.pathExists ./lib/private then import ./lib/private else {})
+} // (if builtins.pathExists ./private then callPackage ./private {} else {})