diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-19 02:23:18 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-19 19:16:21 -0400 |
| commit | 0bdf2a391df5196e00506309789de41f1c98b698 (patch) | |
| tree | 63f62ee6ed0abbb5088c43c5681c62b6ce99aba8 /pkgs | |
| parent | c18bb57627a87c6f03877386ecbc2e22d81d8afd (diff) | |
| download | nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar.gz nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar.bz2 nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar.lz nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar.xz nixlib-0bdf2a391df5196e00506309789de41f1c98b698.tar.zst nixlib-0bdf2a391df5196e00506309789de41f1c98b698.zip | |
lightdm: drop run-dir.patch
That patched the bundled configuration which is useless to NixOS.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/display-managers/lightdm/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/lightdm/run-dir.patch | 13 |
2 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 650bab334333..85687090721d 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { pname = "lightdm"; version = "1.28.0"; - name = "${pname}-${version}"; - outputs = [ "out" "dev" ]; src = fetchFromGitHub { @@ -40,9 +38,9 @@ stdenv.mkDerivation rec { accountsservice audit glib + libXdmcp libgcrypt libxcb - libXdmcp libxklavier pam polkit @@ -50,7 +48,6 @@ stdenv.mkDerivation rec { ++ optional withQt5 qtbase; patches = [ - ./run-dir.patch # Adds option to disable writing dmrc files (fetchpatch { url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; diff --git a/pkgs/applications/display-managers/lightdm/run-dir.patch b/pkgs/applications/display-managers/lightdm/run-dir.patch deleted file mode 100644 index eb8e5a0f4d7e..000000000000 --- a/pkgs/applications/display-managers/lightdm/run-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/lightdm.conf b/data/lightdm.conf -index 16b80f7..b3af435 100644 ---- a/data/lightdm.conf -+++ b/data/lightdm.conf -@@ -28,7 +28,7 @@ - #guest-account-script=guest-account - #logind-check-graphical=false - #log-directory=/var/log/lightdm --#run-directory=/var/run/lightdm -+run-directory=/run/lightdm - #cache-directory=/var/cache/lightdm - #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions - #remote-sessions-directory=/usr/share/lightdm/remote-sessions |