fix(tazjin/emacs): Correctly pass through additional attributes
We really need target list diffing, would have caught this earlier. Change-Id: Ifc064400b3115c6e2242d0b503cde4216b2ee787 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5257 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
This commit is contained in:
		
							parent
							
								
									aab994e0dc
								
							
						
					
					
						commit
						333c12d72d
					
				
					 1 changed files with 32 additions and 27 deletions
				
			
		| 
						 | 
					@ -128,7 +128,7 @@ pkgs.makeOverridable
 | 
				
			||||||
      '';
 | 
					      '';
 | 
				
			||||||
  in
 | 
					  in
 | 
				
			||||||
  lib.fix
 | 
					  lib.fix
 | 
				
			||||||
    (self: l: f: pkgs.writeShellScriptBin "tazjins-emacs" ''
 | 
					    (self: l: f: (pkgs.writeShellScriptBin "tazjins-emacs" ''
 | 
				
			||||||
      export PATH="${emacsBinPath}:$PATH"
 | 
					      export PATH="${emacsBinPath}:$PATH"
 | 
				
			||||||
      exec ${tazjinsEmacs f}/bin/emacs \
 | 
					      exec ${tazjinsEmacs f}/bin/emacs \
 | 
				
			||||||
        --debug-init \
 | 
					        --debug-init \
 | 
				
			||||||
| 
						 | 
					@ -137,7 +137,9 @@ pkgs.makeOverridable
 | 
				
			||||||
        --no-init-file \
 | 
					        --no-init-file \
 | 
				
			||||||
        --directory ${./config} ${if l != null then "--directory ${l}" else ""} \
 | 
					        --directory ${./config} ${if l != null then "--directory ${l}" else ""} \
 | 
				
			||||||
        --eval "(require 'init)" $@
 | 
					        --eval "(require 'init)" $@
 | 
				
			||||||
    '' // {
 | 
					    '').overrideAttrs
 | 
				
			||||||
 | 
					      (_: {
 | 
				
			||||||
 | 
					        passthru = {
 | 
				
			||||||
          # Call overrideEmacs with a function (pkgs -> pkgs) to modify the
 | 
					          # Call overrideEmacs with a function (pkgs -> pkgs) to modify the
 | 
				
			||||||
          # packages that should be included in this Emacs distribution.
 | 
					          # packages that should be included in this Emacs distribution.
 | 
				
			||||||
          overrideEmacs = f': self l f';
 | 
					          overrideEmacs = f': self l f';
 | 
				
			||||||
| 
						 | 
					@ -163,9 +165,12 @@ pkgs.makeOverridable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          # Expose telega/tdlib version check as a target that is built in
 | 
					          # Expose telega/tdlib version check as a target that is built in
 | 
				
			||||||
          # CI.
 | 
					          # CI.
 | 
				
			||||||
 | 
					          #
 | 
				
			||||||
 | 
					          # TODO(tazjin): uncomment when telega works again
 | 
				
			||||||
          inherit tdlibCheck;
 | 
					          inherit tdlibCheck;
 | 
				
			||||||
          meta.ci.targets = [ "tdlibCheck" ];
 | 
					          meta.ci.targets = [ "tdlibCheck" ];
 | 
				
			||||||
    })
 | 
					        };
 | 
				
			||||||
 | 
					      }))
 | 
				
			||||||
    null
 | 
					    null
 | 
				
			||||||
    identity
 | 
					    identity
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue