diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
commit | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (patch) | |
tree | d166c8c37aae3e2856378b4526cfddb66291466d /pkgs/applications/misc | |
parent | 782b63d06ba886d7093af764c2e3441a5e96ffc2 (diff) | |
parent | cf8643cc8e61b0482c87faf33e6310c4e15bcba1 (diff) | |
download | nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.gz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.bz2 nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.lz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.xz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.zst nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/redshift/575.patch | 51 | ||||
-rw-r--r-- | pkgs/applications/misc/redshift/default.nix | 89 | ||||
-rw-r--r-- | pkgs/applications/misc/toot/default.nix | 4 |
3 files changed, 95 insertions, 49 deletions
diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch new file mode 100644 index 000000000000..d731d8ec43ad --- /dev/null +++ b/pkgs/applications/misc/redshift/575.patch @@ -0,0 +1,51 @@ +From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko <yegortimoshenko@riseup.net> +Date: Tue, 16 Jan 2018 11:43:46 +0000 +Subject: [PATCH] Fix Autoconf script + +gettext/intltool macros are not used correctly, see: +https://bugs.launchpad.net/inkscape/+bug/1418943 +--- + bootstrap | 6 +----- + configure.ac | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 0599cf5..40b1dca 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# change to root directory +-cd $(dirname "$0") +- +-autopoint --force && \ +- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose ++autoreconf --force --install && intltoolize +diff --git a/configure.ac b/configure.ac +index be0b51a..a2e7c42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules + AC_LANG([C]) + + AC_PROG_INTLTOOL([0.50]) ++AC_SUBST(LIBINTL) + + AC_CANONICAL_HOST + +@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ + ]) + AC_LANG_POP([Objective C]) + +-# Checks for libraries. +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) +- + GETTEXT_PACKAGE=redshift + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) +-- +2.15.1 + diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3fe0503d7f9d..b4f37719046d 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,68 +1,63 @@ -{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue2 -, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg -, drmSupport ? true, libdrm -, randrSupport ? true, libxcb -, vidModeSupport ? true, libX11, libXxf86vm -}: +{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool +, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }: -let - mkFlag = flag: name: if flag - then "--enable-${name}" - else "--disable-${name}"; -in stdenv.mkDerivation rec { name = "redshift-${version}"; version = "1.11"; - src = fetchurl { - sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"; - url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "jonls"; + repo = "redshift"; + rev = "v${version}"; + sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj"; }; - buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3 - python pygobject3 pyxdg ] - ++ stdenv.lib.optionals drmSupport [ libdrm ] - ++ stdenv.lib.optionals randrSupport [ libxcb ] - ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; - nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ]; + patches = [ + # https://github.com/jonls/redshift/pull/575 + ./575.patch + ]; - configureFlags = [ - (mkFlag guiSupport "gui") - (mkFlag drmSupport "drm") - (mkFlag randrSupport "randr") - (mkFlag vidModeSupport "vidmode") + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkgconfig + wrapGAppsHook + wrapPython ]; - enableParallelBuilding = true; + buildInputs = [ + geoclue2 + gobjectIntrospection + gtk3 + libdrm + libxcb + python + ]; - preInstall = stdenv.lib.optionalString guiSupport '' - substituteInPlace src/redshift-gtk/redshift-gtk \ - --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" - ''; - postInstall = stdenv.lib.optionalString guiSupport '' - wrapProgram "$out/bin/redshift-gtk" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" + pythonPath = [ pygobject3 pyxdg ]; - install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample - ''; + preConfigure = "./bootstrap"; + postFixup = "wrapPythonPrograms"; + + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Gradually change screen color temperature"; + description = "Screen color temperature manager"; longDescription = '' - The color temperature is set according to the position of the - sun. A different color temperature is set during night and - daytime. During twilight and early morning, the color - temperature transitions smoothly from night to daytime - temperature to allow your eyes to slowly adapt. + Redshift adjusts the color temperature according to the position + of the sun. A different color temperature is set during night and + daytime. During twilight and early morning, the color temperature + transitions smoothly from night to daytime temperature to allow + your eyes to slowly adapt. At night the color temperature should + be set to match the lamps in your room. ''; license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; maintainers = with maintainers; [ mornfall nckx ]; - }; + }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index be8652619125..1f8ab8b438dd 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.16.2"; + version = "0.17.1"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "19n6rmm44y24zvkpk56vd2xmx49sn6wc5qayi1jm83jlnlbbwfh7"; + sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; }; checkInputs = with python3Packages; [ pytest ]; |