X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;h=280b69a989f15cfc48ebbc34eb3d7caf68eaca46;hb=712ccefd39a5a71287ada2c7441c28e5cdd80f08;hp=63106d603da53da37694a1fa8d4c1f659b80fcf7;hpb=5c101474d350289370105c99bbf65f8bb3a4ef39;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 63106d6..280b69a 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -7,19 +7,20 @@
   eldiron = { config, pkgs, ... }:
     with import ../libs.nix;
     let
-        mypkgs = nixpkgs_unstable.callPackage ./packages.nix {
+        mypkgs = pkgs.callPackage ./packages.nix {
           inherit checkEnv fetchedGitPrivate fetchedGithub;
-          gitwebOverride = nixpkgs_unstable.gitweb.overrideAttrs(old: {
-            installPhase = old.installPhase + ''
-              cp -r ${./packages/gitweb} $out/gitweb-theme;
-              '';
-          });
         };
     in
   {
     # FIXME: they are not overriden in packages.nix
     # (see nix-store -q --tree /nix/var/nix/profiles/system)
     nixpkgs.config.packageOverrides = oldpkgs: rec {
+      gitolite = nixpkgs_unstable.gitolite;
+      gitweb = oldpkgs.gitweb.overrideAttrs(old: {
+        installPhase = old.installPhase + ''
+          cp -r ${./packages/gitweb} $out/gitweb-theme;
+          '';
+      });
       postgresql = postgresql111;
       postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec {
         passthru = old.passthru // { psqlSchema = "11.0"; };