summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-11-05 11:03:07 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-11-05 11:03:59 +0100
commit5d5efcea14651f7e4002a68c79f9a825d2195a03 (patch)
tree23a546dcec29945266c48687bfe8482de0b4f8af /nixos/modules/services
parent3187b017203d9b2dfa95eb4060d42991ab196dfa (diff)
parent559ddae410d6e0cd3812c51d9408bfb881b32516 (diff)
downloadnixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar.gz
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar.bz2
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar.lz
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar.xz
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.tar.zst
nixpkgs-5d5efcea14651f7e4002a68c79f9a825d2195a03.zip
Merge #20001: docs: use overrideAttrs instead of overrideDerivation
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/editors/emacs.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index bcaa8b8df3d..e03f6046de8 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -356,14 +356,14 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
         <programlisting><![CDATA[
 { pkgs ? import <nixpkgs> {} }:
 let
-  myEmacs = pkgs.lib.overrideDerivation (pkgs.emacs.override {
+  myEmacs = (pkgs.emacs.override {
     # Use gtk3 instead of the default gtk2
     withGTK3 = true;
     withGTK2 = false;
-  }) (attrs: {
+  }).overrideAttrs (attrs: {
     # I don't want emacs.desktop file because I only use
     # emacsclient.
-    postInstall = attrs.postInstall + ''
+    postInstall = (attrs.postInstall or "") + ''
       rm $out/share/applications/emacs.desktop
     '';
   });