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

quirc: 2014-11-01 -> 2016-08-16, fix includes for SDL_gfx

Browse Source
This commit is contained in:
Michael Raskin 2016-08-26 15:07:54 +02:00
parent 0cbba7c673
commit a0aa333aa9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/graphics/quirc/default.nix
View File

@ -1,17 +1,17 @@
{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, pkgconfig}: {stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
let let
s = s =
rec { rec {
date = "2014-11-01"; date = "2016-08-16";
version = "git-${date}"; version = "git-${date}";
baseName = "quirc"; baseName = "quirc";
name = "${baseName}-${version}"; name = "${baseName}-${version}";
url = "https://github.com/dlbeer/quirc"; url = "https://github.com/dlbeer/quirc";
rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb"; rev = "5b262480091d5f84a67a4a56c728fc8b39844339";
sha256 = "1r7jzxl4j93dmky8p5szpcxq7i5f7p1kfrklnzhazlizjc7a2844"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy";
}; };
buildInputs = [ buildInputs = [
SDL SDL_gfx libjpeg pkgconfig SDL SDL_gfx libjpeg pkgconfig libpng
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
inherit (s) url sha256 rev; inherit (s) url sha256 rev;
}; };
NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL"; NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL";
configurePhase = '' configurePhase = ''
sed -e 's/-[og] root//g' -i Makefile sed -e 's/-[og] root//g' -i Makefile
''; '';