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: a35a4884c7c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30783a52bc04
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 3, 2018

  1. EmptyEpsilon: use python3

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    57b6eb6 View commit details

  2. Merge pull request #44405 from dotlambda/emptyepsilon-python3 

    EmptyEpsilon: use python3
    @infinisil
    infinisil authored Aug 3, 2018
    Copy the full SHA
    30783a5 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/games/empty-epsilon/default.nix
4 changes: 2 additions & 2 deletions pkgs/games/empty-epsilon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }:
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3 }:

let

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ cmake ];
buildInputs = [ serious-proton sfml glew libX11 python ];
buildInputs = [ serious-proton sfml glew libX11 python3 ];

cmakeFlags = [
"-DSERIOUS_PROTON_DIR=${serious-proton.src}"