diff options
| author | aszlig <aszlig@nix.build> | 2018-02-26 09:57:45 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-02-26 09:57:55 +0100 |
| commit | 2c94ca56b55805e416300873eaed84feb7d4b79f (patch) | |
| tree | 858b563452b96fd9661978ef5a6c48bbe1345a05 | |
| parent | 01ef7177aeba08ccdcd98c5f8d7afada26e86630 (diff) | |
Revert "services/i3/conky: Fix segfault"
This reverts commit 9dc27c57880db6469865dc2e6aaf295665c681a3. The patch already was from upstream master and it found its way into the new release, so we no longer need it. Signed-off-by: aszlig <aszlig@nix.build>
| -rw-r--r-- | modules/user/aszlig/services/i3/conky.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix index b9e4c5ea..6c5815aa 100644 --- a/modules/user/aszlig/services/i3/conky.nix +++ b/modules/user/aszlig/services/i3/conky.nix @@ -50,16 +50,9 @@ let mkConky = args: let time = cexpr "time" [ "%a %b %d %T %Z %Y" ]; text = concatStringsSep " | " (args ++ singleton time); - conky = (pkgs.conky.override { + conky = pkgs.conky.override { weatherMetarSupport = true; - }).overrideAttrs (drv: { - # This patch fixes a segfault when using "out_to_x = false": - patches = (drv.patches or []) ++ singleton (pkgs.fetchpatch { - url = "https://github.com/brndnmtthws/conky/commit/" - + "562c7375883445acb58388ff16d9eb126b7e12a1.patch"; - sha256 = "0gjb6pw0c2va0z6p0fn6nxprkwq0kp5plfdv0la8mv91ds72mmi6"; - }); - }); + }; in pkgs.writeScript "conky-run.sh" '' #!${pkgs.stdenv.shell} PATH="${pkgs.coreutils}/bin" |