mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
quirc: 2014-11-01 -> 2016-08-16, fix includes for SDL_gfx
This commit is contained in:
parent
0cbba7c673
commit
a0aa333aa9
@ -1,17 +1,17 @@
|
||||
{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, pkgconfig}:
|
||||
{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
|
||||
let
|
||||
s =
|
||||
rec {
|
||||
date = "2014-11-01";
|
||||
date = "2016-08-16";
|
||||
version = "git-${date}";
|
||||
baseName = "quirc";
|
||||
name = "${baseName}-${version}";
|
||||
url = "https://github.com/dlbeer/quirc";
|
||||
rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb";
|
||||
sha256 = "1r7jzxl4j93dmky8p5szpcxq7i5f7p1kfrklnzhazlizjc7a2844";
|
||||
rev = "5b262480091d5f84a67a4a56c728fc8b39844339";
|
||||
sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy";
|
||||
};
|
||||
buildInputs = [
|
||||
SDL SDL_gfx libjpeg pkgconfig
|
||||
SDL SDL_gfx libjpeg pkgconfig libpng
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
src = fetchgit {
|
||||
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 = ''
|
||||
sed -e 's/-[og] root//g' -i Makefile
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user