From 2ce24737c8b4772beb7f904efd886d295b8ead23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Dec 2015 02:37:41 +0100 Subject: [PATCH] redshift: depend on geoclue2 directly --- pkgs/applications/misc/redshift/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6e5404eb686..ad2f5f74cce 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue +, geoclue2 , guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb @@ -17,7 +17,7 @@ stdenv.mkDerivation { url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; - buildInputs = [ geoclue ] + buildInputs = [ geoclue2 ] ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8edfdd17d38..ffc69199f33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14655,7 +14655,6 @@ let redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg; - geoclue = geoclue2; }; orion = callPackage ../misc/themes/orion {};