diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-29 00:24:47 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-29 00:24:47 +0000 |
| commit | e17bc259434c180a85ac4fd4bca1556f4702dabf (patch) | |
| tree | ff2cbbd2746f80fa4847060dce92a71a599aa875 /pkgs/tools/graphics | |
| parent | 2958ec7d6fe1fb7c5e90bac0b3164df5b4c177cc (diff) | |
| parent | c004c6e14d00845f9ee15f0f992eb06325f1bdd8 (diff) | |
| download | nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.gz nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.bz2 nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.lz nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.xz nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.zst nixlib-e17bc259434c180a85ac4fd4bca1556f4702dabf.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/logstalgia/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0deb24ed56f9..f7f9211b5154 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew -, mesa, boost, glm }: +{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew +, mesa, boost, glm, freetype }: stdenv.mkDerivation rec { name = "logstalgia-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; }; - buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost - glm ]; + buildInputs = [ glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa boost + glm freetype ]; meta = with stdenv.lib; { homepage = http://code.google.com/p/logstalgia; |