uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
51
pkgs/applications/misc/redshift/575.patch
Normal file
51
pkgs/applications/misc/redshift/575.patch
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001
|
||||
From: Yana Timoshenko <yana@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
|
||||
|
||||
143
pkgs/applications/misc/redshift/default.nix
Normal file
143
pkgs/applications/misc/redshift/default.nix
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab
|
||||
, autoconf, automake, gettext, intltool
|
||||
, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection
|
||||
, gtk3, python, pygobject3, pyxdg
|
||||
|
||||
, withQuartz ? stdenv.isDarwin, ApplicationServices
|
||||
, withRandr ? stdenv.isLinux, libxcb
|
||||
, withDrm ? stdenv.isLinux, libdrm
|
||||
|
||||
, withGeolocation ? true
|
||||
, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa
|
||||
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
|
||||
, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator
|
||||
}:
|
||||
|
||||
let
|
||||
mkRedshift =
|
||||
{ pname, version, src, meta }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src meta;
|
||||
|
||||
patches = lib.optionals (pname != "gammastep") [
|
||||
# https://github.com/jonls/redshift/pull/575
|
||||
./575.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
intltool
|
||||
libtool
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapPython
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-randr=${if withRandr then "yes" else "no"}"
|
||||
"--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
|
||||
"--enable-drm=${if withDrm then "yes" else "no"}"
|
||||
"--enable-quartz=${if withQuartz then "yes" else "no"}"
|
||||
"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
|
||||
] ++ lib.optionals (pname == "gammastep") [
|
||||
"--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/"
|
||||
"--enable-apparmor"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
python
|
||||
] ++ lib.optional withRandr libxcb
|
||||
++ lib.optional withGeoclue geoclue
|
||||
++ lib.optional withDrm libdrm
|
||||
++ lib.optional withQuartz ApplicationServices
|
||||
++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
|
||||
++ lib.optional withAppIndicator (if (pname != "gammastep")
|
||||
then libappindicator
|
||||
else libayatana-appindicator)
|
||||
;
|
||||
|
||||
pythonPath = [ pygobject3 pyxdg ];
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
wrapGApp $out/bin/${pname}
|
||||
'';
|
||||
|
||||
# the geoclue agent may inspect these paths and expect them to be
|
||||
# valid without having the correct $PATH set
|
||||
postInstall = if (pname == "gammastep") then ''
|
||||
substituteInPlace $out/share/applications/gammastep.desktop \
|
||||
--replace 'Exec=gammastep' "Exec=$out/bin/gammastep"
|
||||
substituteInPlace $out/share/applications/gammastep-indicator.desktop \
|
||||
--replace 'Exec=gammastep-indicator' "Exec=$out/bin/gammastep-indicator"
|
||||
'' else ''
|
||||
substituteInPlace $out/share/applications/redshift.desktop \
|
||||
--replace 'Exec=redshift' "Exec=$out/bin/redshift"
|
||||
substituteInPlace $out/share/applications/redshift-gtk.desktop \
|
||||
--replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
};
|
||||
in
|
||||
rec {
|
||||
redshift = mkRedshift rec {
|
||||
pname = "redshift";
|
||||
version = "1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonls";
|
||||
repo = "redshift";
|
||||
rev = "v${version}";
|
||||
sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Screen color temperature manager";
|
||||
longDescription = ''
|
||||
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.unix;
|
||||
maintainers = with maintainers; [ globin yana ];
|
||||
};
|
||||
};
|
||||
|
||||
gammastep = mkRedshift rec {
|
||||
pname = "gammastep";
|
||||
version = "2.0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "chinstrap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1";
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
name = "${pname}-${version}";
|
||||
longDescription = "Gammastep"
|
||||
+ lib.removePrefix "Redshift" redshift.meta.longDescription;
|
||||
homepage = "https://gitlab.com/chinstrap/gammastep";
|
||||
maintainers = [ lib.maintainers.primeos ] ++ redshift.meta.maintainers;
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue