diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 311c28db556a..e73f3392cea3 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -64,7 +64,16 @@ let preConfigure = "./bootstrap"; - postFixup = "wrapPythonPrograms"; + 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 @@ -112,24 +121,6 @@ rec { }; }; - redshift-wlr = mkRedshift { - pname = "redshift-wlr"; - # upstream rebases so this is the push date - version = "2019-08-24"; - - src = fetchFromGitHub { - owner = "minus7"; - repo = "redshift"; - rev = "7da875d34854a6a34612d5ce4bd8718c32bec804"; - sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22"; - }; - - meta = redshift.meta // { - description = redshift.meta.description + "(with wlroots patches)"; - homepage = "https://github.com/minus7/redshift"; - }; - }; - gammastep = mkRedshift rec { pname = "gammastep"; version = "2.0.7"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ff990489380..746d35d4d766 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -803,6 +803,7 @@ mapAliases ({ ring-daemon = jami-daemon; # added 2021-10-26 radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 + redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 rpiboot-unstable = rpiboot; # added 2021-07-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91233f4265d8..73e2b3fe8827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31346,7 +31346,7 @@ with pkgs; inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr gammastep; + }) redshift gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };