summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-08-08 20:38:12 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-08-09 17:36:47 +0200
commit69c47a3d91a7afff7f0b899d60cbfb8ea6538058 (patch)
tree85735642ba7bae323e54778c45139946a5459904
parent635f4a29387f45d14926a3f3c0b18e4cd839855b (diff)
downloadnixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar.gz
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar.bz2
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar.lz
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar.xz
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.tar.zst
nixpkgs-69c47a3d91a7afff7f0b899d60cbfb8ea6538058.zip
nixos/metacity: switch to gnome3.metacity
-rw-r--r--nixos/modules/services/x11/window-managers/metacity.nix12
1 files changed, 3 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 436eccbaf0c..5175fd7f3b1 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -5,9 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.windowManager.metacity;
-  xorg = config.services.xserver.package;
-  gnome = pkgs.gnome;
-
+  inherit (pkgs) gnome3;
 in
 
 {
@@ -20,16 +18,12 @@ in
     services.xserver.windowManager.session = singleton
       { name = "metacity";
         start = ''
-          env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/
-          # !!! Hack: load the schemas for Metacity.
-          GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \
-            --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
-          ${gnome.metacity}/bin/metacity &
+          ${gnome3.metacity}/bin/metacity &
           waitPID=$!
         '';
       };
 
-    environment.systemPackages = [ gnome.metacity ];
+    environment.systemPackages = [ gnome3.metacity ];
 
   };