public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42346 from Ma27/fix-yabar 

yabar: fix build
This commit is contained in:
Pascal Wittmann 2018-06-22 09:47:05 +02:00 committed by GitHub
parent 85b1312b07 2ae32923ed
commit 11a0d130ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/yabar/build.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig { stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
, configFile ? null, lib , configFile ? null, lib
, rev, sha256, version , rev, sha256, version, patches ? []
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,6 +14,8 @@ stdenv.mkDerivation {
repo = "yabar"; repo = "yabar";
}; };
inherit patches;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

14
pkgs/applications/window-managers/yabar/default.nix
View File

@ -1,10 +1,18 @@
{ callPackage, attrs ? {} }: { callPackage, attrs ? {}, fetchpatch }:
let let
overrides = { overrides = rec {
version = "0.4.0"; version = "0.4.0";
rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b"; rev = version;
sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6"; sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
patches = [
(fetchpatch {
url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";
sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";
})
];
} // attrs; } // attrs;
in callPackage ./build.nix overrides in callPackage ./build.nix overrides