diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-06-22 09:47:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 09:47:05 +0200 |
| commit | 11a0d130ff6d50fbda4db7369c20c5add869ad59 (patch) | |
| tree | 9da19375f2b17d498218e64db24de211ec259f0e /pkgs/applications | |
| parent | 85b1312b0785514fd59306081a3bcd23e1bda761 (diff) | |
| parent | 2ae32923ed6a5650841f904ee0dcec434daeb432 (diff) | |
| download | nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar.gz nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar.bz2 nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar.lz nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar.xz nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.tar.zst nixlib-11a0d130ff6d50fbda4db7369c20c5add869ad59.zip | |
Merge pull request #42346 from Ma27/fix-yabar
yabar: fix build
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/window-managers/yabar/build.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/yabar/default.nix | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index a5d02093e3f6..6fc1797dd251 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib -, rev, sha256, version +, rev, sha256, version, patches ? [] }: stdenv.mkDerivation { @@ -14,6 +14,8 @@ stdenv.mkDerivation { repo = "yabar"; }; + inherit patches; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix index 4d42e3082f35..a33a75676ee9 100644 --- a/pkgs/applications/window-managers/yabar/default.nix +++ b/pkgs/applications/window-managers/yabar/default.nix @@ -1,10 +1,18 @@ -{ callPackage, attrs ? {} }: +{ callPackage, attrs ? {}, fetchpatch }: let - overrides = { + overrides = rec { version = "0.4.0"; - rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b"; + rev = version; sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6"; + + patches = [ + (fetchpatch { + url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch"; + sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s"; + }) + ]; + } // attrs; in callPackage ./build.nix overrides |