From 52893d527638be9ddeb3669796856508afff252e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 17 Apr 2018 13:49:19 -0500
Subject: treewide: move "extensions" drvs to dir

This cleans up the tree for pkgs/applications somewhat. Should not
change any hashes.
---
 .../lightdm-gtk-greeter/default.nix                | 51 ----------------------
 .../display-managers/lightdm/gtk-greeter.nix       | 51 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
 create mode 100644 pkgs/applications/display-managers/lightdm/gtk-greeter.nix

(limited to 'pkgs/applications/display-managers')

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
deleted file mode 100644
index 3227151ce21e..000000000000
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, lightdm, pkgconfig, intltool
-, hicolor-icon-theme, makeWrapper
-, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
-, exo
-}:
-
-#ToDo: bad icons with gtk2;
-#  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
-
-let
-  ver_branch = "2.0";
-  version = "2.0.5";
-in
-stdenv.mkDerivation rec {
-  name = "lightdm-gtk-greeter-${version}";
-
-  src = fetchurl {
-    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ lightdm exo intltool makeWrapper ]
-    ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
-
-  configureFlags = [
-    "--localstatedir=/var"
-    "--sysconfdir=/etc"
-  ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
-
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
-
-  installFlags = [
-    "localstatedir=\${TMPDIR}"
-    "sysconfdir=\${out}/etc"
-  ];
-
-  postInstall = ''
-    substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
-      --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
-    wrapProgram "$out/sbin/lightdm-gtk-greeter" \
-      --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://launchpad.net/lightdm-gtk-greeter;
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ocharles wkennington ];
-  };
-}
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
new file mode 100644
index 000000000000..3227151ce21e
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, lightdm, pkgconfig, intltool
+, hicolor-icon-theme, makeWrapper
+, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+, exo
+}:
+
+#ToDo: bad icons with gtk2;
+#  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
+
+let
+  ver_branch = "2.0";
+  version = "2.0.5";
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-gtk-greeter-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ lightdm exo intltool makeWrapper ]
+    ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+  ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
+
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
+
+  installFlags = [
+    "localstatedir=\${TMPDIR}"
+    "sysconfdir=\${out}/etc"
+  ];
+
+  postInstall = ''
+    substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
+      --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    wrapProgram "$out/sbin/lightdm-gtk-greeter" \
+      --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/lightdm-gtk-greeter;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ocharles wkennington ];
+  };
+}
-- 
cgit v1.2.3