4 files changed, 24 insertions, 40 deletions
diff --git a/derivations/lowbat/default.nix b/derivations/lowbat/default.nix
index 1442d7b..64ec205 100644
--- a/derivations/lowbat/default.nix
+++ b/derivations/lowbat/default.nix
@@ -1,9 +1,9 @@
-{ lib,
-  fetchzip,
-  glib,
-  libnotify,
-  pkg-config,
-  stdenv,
+{ lib
+, fetchzip
+, glib
+, libnotify
+, pkg-config
+, stdenv
 }:
 
 stdenv.mkDerivation rec {
diff --git a/derivations/pavolctld/default.nix b/derivations/pavolctld/default.nix
index b1027bf..d092ed5 100644
--- a/derivations/pavolctld/default.nix
+++ b/derivations/pavolctld/default.nix
@@ -1,7 +1,7 @@
-{ lib,
-  fetchzip,
-  libpulseaudio,
-  stdenv,
+{ lib
+, fetchzip
+, libpulseaudio
+, stdenv
 }:
 
 stdenv.mkDerivation rec {
diff --git a/derivations/st/default.nix b/derivations/st/default.nix
index 3f00842..4c7f3a6 100644
--- a/derivations/st/default.nix
+++ b/derivations/st/default.nix
@@ -1,14 +1,13 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  fontconfig,
-  libX11,
-  libXcursor,
-  libXext,
-  libXft,
-  ncurses,
-  pkg-config,
+{ lib
+, fetchzip
+, fontconfig
+, libX11
+, libXcursor
+, libXext
+, libXft
+, ncurses
+, pkg-config
+, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -20,26 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-p1u7TEeLeC5Kjvi8na4YhyQQ0qdPaUWZL6hq9O4HaKA=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
-  buildInputs = [
-    fontconfig
-    libX11
-    libXcursor
-    libXext
-    libXft
-    ncurses
-  ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ fontconfig libX11 libXcursor libXext libXft ncurses ];
 
   makeFlags = [ "CFLAGS=-Ofast" ];
-  installPhase = ''
-    runHook preInstall
-
-    TERMINFO=$out/share/terminfo make install PREFIX=$out
-
-    runHook postInstall
-  '';
+  installFlags = [ "PREFIX=$(out)" "TERMINFO=$(out)/share/terminfo" ];
 
   meta = with lib; {
     homepage = "https://git.tjkeller.xyz/st";
diff --git a/modules/root/resources/x11/xinit-startx-xdg.patch b/modules/root/resources/x11/xinit-startx-xdg.patch
index c1bca97..2c2bf62 100644
--- a/modules/root/resources/x11/xinit-startx-xdg.patch
+++ b/modules/root/resources/x11/xinit-startx-xdg.patch
@@ -7,7 +7,7 @@ index dfbebe1..472a1b0 100644
 
      XCOMM create a file with auth information for the server. ':0' is a dummy.
 -    xserverauthfile=$HOME/.serverauth.$$
-+    xserverauthfile="${XAUTHORITY:-$HOME/.Xauthority}"
++    xserverauthfile="${XAUTHORITY:-$HOME/.Xauthority}.$$"
      trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
      xauth -q -f "$xserverauthfile" << EOF
  add :$dummy . $mcookie