mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge pull request #43868 from jtojnar/drop-geoclue1
Drop geoclue1 & geoclue2: 2.4.8 → 2.4.10
This commit is contained in:
commit
710d4e76dd
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,36 +1,56 @@
|
|||||||
{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2,
|
{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
|
||||||
libxslt, glib-networking }:
|
, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
|
||||||
|
, withDemoAgent ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
with stdenv.lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "geoclue-0.12.0";
|
name = "geoclue-${version}";
|
||||||
|
version = "2.4.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
|
url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||||
sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
|
sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ];
|
pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [dbus glib dbus-glib];
|
buildInputs = [
|
||||||
|
glib json-glib libsoup avahi
|
||||||
|
] ++ optionals withDemoAgent [
|
||||||
|
libnotify gdk_pixbuf
|
||||||
|
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
propagatedBuildInputs = [ glib glib-networking ];
|
||||||
|
|
||||||
preConfigure = ''
|
configureFlags = [
|
||||||
sed -e '/-Werror/d' -i configure
|
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||||
|
"--enable-introspection"
|
||||||
|
"--enable-gtk-doc"
|
||||||
|
"--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
|
||||||
|
] ++ optionals stdenv.isDarwin [
|
||||||
|
"--disable-silent-rules"
|
||||||
|
"--disable-3g-source"
|
||||||
|
"--disable-cdma-source"
|
||||||
|
"--disable-modem-gps-source"
|
||||||
|
"--disable-nmea-source"
|
||||||
|
];
|
||||||
|
|
||||||
|
# https://gitlab.freedesktop.org/geoclue/geoclue/issues/73
|
||||||
|
postInstall = ''
|
||||||
|
sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Geolocation framework and some data providers";
|
description = "Geolocation framework and some data providers";
|
||||||
maintainers = with maintainers; [ raskin ];
|
homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home;
|
||||||
platforms = platforms.linux;
|
maintainers = with maintainers; [ raskin garbas ];
|
||||||
|
platforms = with platforms; linux ++ darwin;
|
||||||
license = licenses.lgpl2;
|
license = licenses.lgpl2;
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
|
||||||
updateInfo = {
|
|
||||||
downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -9260,9 +9260,7 @@ with pkgs;
|
|||||||
gtk = self.gtk2;
|
gtk = self.gtk2;
|
||||||
};
|
};
|
||||||
|
|
||||||
geoclue = callPackage ../development/libraries/geoclue {};
|
geoclue2 = callPackage ../development/libraries/geoclue {};
|
||||||
|
|
||||||
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
|
|
||||||
|
|
||||||
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
|
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
|
||||||
drvName = "geoip-tools";
|
drvName = "geoip-tools";
|
||||||
|
Loading…
Reference in New Issue
Block a user