From ff2bb85e2ce490489286529bb9447e527c5f5956 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Sep 2015 03:18:16 +0200 Subject: [PATCH] redshift: clean up a little - Remove bogus second 'python' argument from substituteInPlace - Format optional dependencies after their *Support argument --- pkgs/applications/misc/redshift/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 9dc5166dd0c..99731a598b6 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,10 +1,9 @@ -{ fetchurl, stdenv, gettext, intltool, pkgconfig, makeWrapper -, geoclue, python, pygobject3, gtk3, pyxdg -, libdrm, libX11, libxcb, libXxf86vm -, guiSupport ? true -, drmSupport ? true -, randrSupport ? true -, vidModeSupport ? true +{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig +, geoclue +, guiSupport ? true, gtk3, python, pygobject3, pyxdg +, drmSupport ? true, libdrm +, randrSupport ? true, libxcb +, vidModeSupport ? true, libX11, libXxf86vm }: let @@ -33,7 +32,7 @@ stdenv.mkDerivation { ]; preInstall = stdenv.lib.optionalString guiSupport '' - substituteInPlace src/redshift-gtk/redshift-gtk python \ + substituteInPlace src/redshift-gtk/redshift-gtk \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" '';