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

Merge branch 'master' into staging

Browse Source 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
This commit is contained in:
obadz
2016-08-27 23:54:54 +01:00
parent 132571454c df27c35e9a
commit 3de6e5be50
209 changed files with 5290 additions and 5482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/navit/default.nix
+6 -3
View File
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# 'cvs' is only for the autogen
buildInputs = [ pkgconfig gtk SDL fontconfig freetype imlib2 SDL_image mesa
libXmu freeglut python gettext quesoglc gd postgresql cmake qt4 SDL_ttf fribidi ];
buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa
libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
nativeBuildInputs = [ pkgconfig cmake ];
NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
cmakeFlags = [ "-DSAMPLE_MAP=n" ];