@@ -1,6 +1,6 @@
1−{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
1+{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
22
3−stdenv.mkDerivation {
3+stdenv.mkDerivation rec {
44 # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
55 # so that it can be written to when using the Self transposer. Running 'Self'
66 # after installation runs without an image. You can then build a Self image with:
@@ -11,16 +11,18 @@ stdenv.mkDerivation {
1111 # This image can later be started with:
1212 # $ Self -s myimage.snap
1313 #
14− version = "4.5.0";
1514 pname = "self";
15+ version = "2017.1";
1616
17− src = fetchgit {
18− url = "https://github.com/russellallen/self";
19− rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86";
20− sha256 = "1dhs6209407j0ll9w9id31vbawdrm9nz1cjak8g8hixrw1nid4i5";
17+ src = fetchFromGitHub {
18+ owner = "russellallen";
19+ repo = pname;
20+ rev = version;
21+ sha256 = "C/1Q6yFmoXx2F97xuvkm8DxFmmvuBS7uYZOxq/CRNog=";
2122 };
2223
23− buildInputs = [ ncurses xorg.libX11 xorg.libXext makeWrapper cmake ];
24+ nativeBuildInputs = [ cmake makeWrapper ];
25+ buildInputs = [ ncurses libX11 libXext ];
2426
2527 selfWrapper = ./self;
2628
@@ -33,12 +35,11 @@ stdenv.mkDerivation {
3335 --set SELF_ROOT "$out"
3436 '';
3537
36− meta = {
38+ meta = with stdenv.lib; {
3739 description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
3840 homepage = "https://selflanguage.org/";
39− license = stdenv.lib.licenses.bsd3;
40− maintainers = [ stdenv.lib.maintainers.doublec ];
41− platforms = with stdenv.lib.platforms; linux;
42− broken = true; # segfaults on gcc > 4.4
41+ license = licenses.bsd3;
42+ maintainers = [ maintainers.doublec ];
43+ platforms = platforms.linux;
4344 };
4445}