diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-27 15:26:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 13:05:28 +0200 |
| commit | 75a1ec8a655e7e00a6bb6fc944663c21624fff60 (patch) | |
| tree | fcbfd398fd7e7b41f88bd3104040c12101bb8343 /nixos/modules/services/x11/xserver.nix | |
| parent | 750195db7f369a6e73d400c0271ef2fa1e0479f0 (diff) | |
| download | nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.gz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.bz2 nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.lz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.xz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.zst nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.zip | |
NixOS: Use runCommand instead of mkDerivation in a few places
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6c6a1e79ed0..1bd578424ee 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -71,15 +71,11 @@ let monitors = reverseList (foldl mkMonitor [] xrandrHeads); in concatMapStrings (getAttr "value") monitors; - configFile = pkgs.stdenv.mkDerivation { - name = "xserver.conf"; - - xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; - - inherit (cfg) config; - - buildCommand = + configFile = pkgs.runCommand "xserver.conf" + { xfs = optionalString (cfg.useXFS != false) + ''FontPath "${toString cfg.useXFS}"''; + inherit (cfg) config; + } '' echo 'Section "Files"' >> $out echo $xfs >> $out @@ -102,7 +98,6 @@ let echo "$config" >> $out ''; # */ - }; in |