tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
blastem: stay with python2
Frederik Rietdijk
4 years ago
d39767ea
d82543f2
+3
-5
2 changed files
expand all
collapse all
unified
split
pkgs
misc
emulators
blastem
default.nix
top-level
all-packages.nix
+2
-2
pkgs/misc/emulators/blastem/default.nix
···
1
1
-
{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }:
1
1
+
{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python2Packages, makeWrapper }:
2
2
3
3
let
4
4
vasm =
···
26
26
sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";
27
27
};
28
28
nativeBuildInputs = [ makeWrapper ];
29
29
-
buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ];
29
29
+
buildInputs = [ pkg-config SDL2 glew xcftools python2Packages.python python2Packages.pillow vasm ];
30
30
preBuild = ''
31
31
patchShebangs img2tiles.py
32
32
'';
+1
-3
pkgs/top-level/all-packages.nix
···
3537
3537
birdfont = callPackage ../tools/misc/birdfont { };
3538
3538
xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
3539
3539
3540
3540
-
blastem = callPackage ../misc/emulators/blastem {
3541
3541
-
inherit (python27Packages) pillow;
3542
3542
-
};
3540
3540
+
blastem = callPackage ../misc/emulators/blastem { };
3543
3541
3544
3542
blueberry = callPackage ../tools/bluetooth/blueberry { };
3545
3543