diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-08-26 15:07:54 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-08-26 15:08:10 +0200 |
| commit | a0aa333aa97de14f1f0320111faebfe473293706 (patch) | |
| tree | a233e217e7954041b9399a90d8580b1a2b07899d | |
| parent | 0cbba7c673267ab53c84bd93918857bb175a5ad2 (diff) | |
| download | nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar.gz nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar.bz2 nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar.lz nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar.xz nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.tar.zst nixpkgs-a0aa333aa97de14f1f0320111faebfe473293706.zip | |
quirc: 2014-11-01 -> 2016-08-16, fix includes for SDL_gfx
| -rw-r--r-- | pkgs/tools/graphics/quirc/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 2769a988669..a801dd8ebda 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -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 ''; |