Merge pull request #94565 from primeos/gammastep

gammastep: init at 2.0.1
redshift,redshift-wlr: Fix a file path in postInstall
This commit is contained in:
Michael Weiss 2020-08-06 12:06:17 +02:00 committed by GitHub
commit 4fe5107376
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 5 deletions

View file

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool { stdenv, fetchFromGitHub, fetchFromGitLab
, autoconf, automake, gettext, intltool
, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection
, gtk3, python, pygobject3, pyxdg , gtk3, python, pygobject3, pyxdg
@ -18,11 +19,16 @@ let
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version src meta; inherit pname version src meta;
patches = [ patches = stdenv.lib.optionals (pname != "gammastep") [
# https://github.com/jonls/redshift/pull/575 # https://github.com/jonls/redshift/pull/575
./575.patch ./575.patch
]; ];
postPatch = stdenv.lib.optionalString (pname == "gammastep") ''
substituteInPlace configure.ac \
--replace "[gammastep], [2.0]" "[gammastep], [${version}]"
'';
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf
automake automake
@ -62,10 +68,15 @@ let
# the geoclue agent may inspect these paths and expect them to be # the geoclue agent may inspect these paths and expect them to be
# valid without having the correct $PATH set # valid without having the correct $PATH set
postInstall = '' 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 \ substituteInPlace $out/share/applications/redshift.desktop \
--replace 'Exec=redshift' "Exec=$out/bin/redshift" --replace 'Exec=redshift' "Exec=$out/bin/redshift"
substituteInPlace $out/share/applications/redshift.desktop \ substituteInPlace $out/share/applications/redshift-gtk.desktop \
--replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
''; '';
@ -118,4 +129,24 @@ rec {
homepage = "https://github.com/minus7/redshift"; homepage = "https://github.com/minus7/redshift";
}; };
}; };
gammastep = mkRedshift rec {
pname = "gammastep";
version = "2.0.1";
src = fetchFromGitLab {
owner = "chinstrap";
repo = pname;
rev = "v${version}";
sha256 = "1ky4h892sg2mfbwwq5xv0vnjflsl2x3nsy5q456r1kyk1gwkj0rg";
};
meta = redshift.meta // {
name = "${pname}-${version}";
longDescription = "Gammastep"
+ stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription;
homepage = "https://gitlab.com/chinstrap/gammastep";
maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers;
};
};
} }

View file

@ -24971,7 +24971,7 @@ in
inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (python3Packages) python pygobject3 pyxdg wrapPython;
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
geoclue = geoclue2; geoclue = geoclue2;
}) redshift redshift-wlr; }) redshift redshift-wlr gammastep;
redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };