Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9df14757c9a9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2cedac28c82
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 7, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    Copy the full SHA
    c2cedac View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/games/spring/default.nix
12 changes: 8 additions & 4 deletions pkgs/games/spring/default.nix
Original file line number Diff line number Diff line change
@@ -7,14 +7,18 @@

stdenv.mkDerivation rec {
pname = "spring";
version = "104.0.1";
version = "104.0.1-${buildId}-g${shortRev}";
# usually the latest in https://github.com/spring/spring/commits/maintenance
rev = "8ecf38a784ed3c4e3d67bc8d59839a77e0f0b83e";
shortRev = builtins.substring 0 7 rev;
buildId = "1477";

# taken from https://github.com/spring/spring/commits/maintenance
src = fetchFromGitHub {
owner = "spring";
repo = "spring";
rev = "69b06d03411fd97f0042a348d839e88d16bd6cb1";
sha256 = "16dfh0alb3zz5q8d00fy91banicrn69hf1scmq6vgjhzhzsvnlxj";
inherit rev;
sha256 = "0iai1wnd7msabgw2979cp2k54sgcfvidfmymhnck31jwbfa6y021";
fetchSubmodules = true;
};

@@ -29,7 +33,7 @@ stdenv.mkDerivation rec {
patchShebangs .
rm rts/build/cmake/FindGLEW.cmake
echo "104.0.1-1474-g69b06d0 maintenance" > VERSION
echo "${version} maintenance" > VERSION
'';

cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"