diff options
| author | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
|---|---|---|
| committer | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
| commit | 6366509e5456cf1d5960d3f0b93a8eb0624f5133 (patch) | |
| tree | 91c3090c7137f057e81f7931eb6c875b5bf1f8c3 /pkgs/games/spring/default.nix | |
| parent | 66dbde4002b8ee64dd060ab06f9ecfbff9f2dd13 (diff) | |
| parent | 5c80997ebdea1572234925fb609cd89f7e0f9c6a (diff) | |
| download | nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.gz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.bz2 nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.lz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.xz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.zst nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.zip | |
Merge branch 'upstream' into pam_mount
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/games/spring/default.nix')
| -rw-r--r-- | pkgs/games/spring/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 539be06bf7f..69387f0cfd3 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { # reported upstream http://springrts.com/mantis/view.php?id=4305 #enableParallelBuilding = true; # occasionally missing generated files on Hydra + NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility + postInstall = '' wrapProgram "$out/bin/spring" \ --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" |