From 919a507cb2bcff3f449dbef57082e24c1a32827e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Jul 2018 02:30:10 +0200
Subject: geoclue2: move to default.nix

---
 pkgs/development/libraries/geoclue/2.0.nix     | 50 --------------------------
 pkgs/development/libraries/geoclue/default.nix | 50 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/geoclue/2.0.nix
 create mode 100644 pkgs/development/libraries/geoclue/default.nix

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
deleted file mode 100644
index eb7a6d6aaf21..000000000000
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip
-, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
-}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "geoclue-2.4.8";
-
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
-    sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook gobjectIntrospection
-  ];
-
-  buildInputs = [ glib json-glib libsoup geoip
-     dbus dbus-glib avahi
-   ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
-
-  propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ];
-
-  preConfigure = ''
-     substituteInPlace configure --replace "-Werror" ""
-  '';
-
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
-                   optionals stdenv.isDarwin [
-                       "--disable-silent-rules"
-                       "--disable-3g-source"
-                       "--disable-cdma-source"
-                       "--disable-modem-gps-source"
-                       "--disable-nmea-source" ];
-
-  postInstall = ''
-    sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Geolocation framework and some data providers";
-    homepage = https://freedesktop.org/wiki/Software/GeoClue/;
-    maintainers = with maintainers; [ raskin garbas ];
-    platforms = with platforms; linux ++ darwin;
-    license = licenses.lgpl2;
-  };
-}
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
new file mode 100644
index 000000000000..eb7a6d6aaf21
--- /dev/null
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -0,0 +1,50 @@
+{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip
+, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "geoclue-2.4.8";
+
+  src = fetchurl {
+    url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
+    sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [
+    pkgconfig intltool wrapGAppsHook gobjectIntrospection
+  ];
+
+  buildInputs = [ glib json-glib libsoup geoip
+     dbus dbus-glib avahi
+   ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
+
+  propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ];
+
+  preConfigure = ''
+     substituteInPlace configure --replace "-Werror" ""
+  '';
+
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
+                   optionals stdenv.isDarwin [
+                       "--disable-silent-rules"
+                       "--disable-3g-source"
+                       "--disable-cdma-source"
+                       "--disable-modem-gps-source"
+                       "--disable-nmea-source" ];
+
+  postInstall = ''
+    sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Geolocation framework and some data providers";
+    homepage = https://freedesktop.org/wiki/Software/GeoClue/;
+    maintainers = with maintainers; [ raskin garbas ];
+    platforms = with platforms; linux ++ darwin;
+    license = licenses.lgpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7451517a9f0..1a55c07e88e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9232,7 +9232,7 @@ with pkgs;
     gtk = self.gtk2;
   };
 
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
+  geoclue2 = callPackage ../development/libraries/geoclue {};
 
   geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
     drvName = "geoip-tools";
-- 
cgit 1.4.1