[Nix-dev] Re: [Nix-commits] SVN commit: nix - 14887 - eelco - in nixos/trunk: etc system upstart-jobs

[Nicolas Pierron]

On Sun, Apr 5, 2009 at 20:30, Eelco Dolstra <e.dolstra at tudelft.nl> wrote:
> Author: eelco
> Date: 2009-04-05 18:30:39 +0000 (Sun, 05 Apr 2009)
> New Revision: 14887
>
> You can view the changes in this commit at:
>   https://svn.nixos.org/viewvc/nix?rev=14887&view=rev
>
> Modified:
>   nixos/trunk/etc/bashrc.sh
>   nixos/trunk/etc/default.nix
>   nixos/trunk/system/system.nix
>   nixos/trunk/upstart-jobs/default.nix
>   nixos/trunk/upstart-jobs/xserver.nix
>
> Log:
> * Let KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS contain the KDE
>  packages that we need rather than just /var/run/current-system/sw.
>  This ensures consistency when upgrading a system (e.g. you don't end
>  up with a mix of KDE versions at runtime).  This partially reverts
>  r14148 (in particular the update-mime-database hack in the
>  systemPath post-build).
>
>
> Changes:
>
> Modified: nixos/trunk/etc/default.nix
> ===================================================================
> --- nixos/trunk/etc/default.nix 2009-04-05 18:25:21 UTC (rev 14886)
> +++ nixos/trunk/etc/default.nix 2009-04-05 18:30:39 UTC (rev 14887)
> @@ -108,6 +109,11 @@
>         timeZone = config.time.timeZone;
>         defaultLocale = config.i18n.defaultLocale;
>         inherit nixEnvVars;
> +        # !!! in the modular NixOS these should be declared by the KDE
> +        # component.
> +        kdeDirs = pkgs.lib.concatStringsSep ":" kdePackages;
> +        xdgConfigDirs = pkgs.lib.makeSearchPath "etc/xdg" kdePackages;
> +        xdgDataDirs = pkgs.lib.makeSearchPath "share" kdePackages;
>       };
>       target = "bashrc";
>     }

Thanks for the comment :)
I'll replace that by a shellInit option which is similar to nixEnvVars.


-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron
- If you are doing something twice then you should try to do it once.