diff options
author | Artturi <Artturin@artturin.com> | 2022-01-01 08:05:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-01 08:05:08 +0200 |
commit | 5d172c65b4a164389ec250d381a5f256a95244f4 (patch) | |
tree | 1d58c61e90ad9e30a889bb86741a0026d2a800d0 /pkgs/applications/misc/redshift/default.nix | |
parent | 6f05cfdb1e78d36c0337516df674560e4b51c79b (diff) | |
parent | c1615bbd41a488f85f295a9ec3ec1830fe232bec (diff) | |
download | nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar.gz nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar.bz2 nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar.lz nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar.xz nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.tar.zst nixpkgs-5d172c65b4a164389ec250d381a5f256a95244f4.zip |
Merge pull request #152137 from Artturin/redgam
{redshift,gammastep}: do not double wrap & redshift-wlr: remove
Diffstat (limited to 'pkgs/applications/misc/redshift/default.nix')
-rw-r--r-- | pkgs/applications/misc/redshift/default.nix | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 311c28db556..e73f3392cea 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"; |