d070216 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

pharo: update URL to HTTPS

commitd0702162e9c127222bd376451e3bc786a7fe3cb0 authorAndersonTorres <torres.anderson.85@protonmail.com> dateSun 25 Oct 2020, 21:41 (6 years ago) parent507a352

4 files changed+62−43

compare with master

unifiedsplit

pkgs/development/pharo/launcher/default.nix+3−4 pkgs/development/pharo/vm/build-vm-legacy.nix+30−10 pkgs/development/pharo/vm/build-vm.nix+28−28 pkgs/development/pharo/vm/share.nix+1−1

pkgs/development/pharo/launcher/default.nix+3−4

@@ -55,10 +55,10 @@ stdenv.mkDerivation rec {

5555 test "$?" == 124 && echo "ok")

5656 '';

5757

58− meta = {

58+ meta = with stdenv.lib; {

5959 description = "Launcher for Pharo distributions";

60+ homepage = "https://pharo.org";

6061 longDescription = ''

61−

6262 Pharo's goal is to deliver a clean, innovative, free open-source

6363 Smalltalk-inspired environment. By providing a stable and small

6464 core system, excellent dev tools, and maintained releases, Pharo

@@ -75,8 +75,7 @@ stdenv.mkDerivation rec {

7575 access it very rapidly from your OS application launcher. As a

7676 result, launching any image is never more than 3 clicks away.

7777 '';

78− homepage = "http://pharo.org";

79− license = stdenv.lib.licenses.mit;

78+ license = licenses.mit;

8079 maintainers = [ ];

8180 platforms = pharo.meta.platforms;

8281 };

pkgs/development/pharo/vm/build-vm-legacy.nix+30−10

@@ -1,4 +1,20 @@

1−{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }:

1+{ stdenv

2+, fetchurl

3+, cmake

4+, bash

5+, unzip

6+, glibc

7+, openssl

8+, gcc

9+, libGLU

10+, libGL

11+, freetype

12+, xorg

13+, alsaLib

14+, cairo

15+, libuuid

16+, makeWrapper

17+, ... }:

218

319{ name, src, ... }:

420

@@ -10,7 +26,15 @@ stdenv.mkDerivation rec {

1026

1127 hardeningDisable = [ "format" "pic" ];

1228

13− # Building

29+ nativeBuildInputs = [ unzip cmake gcc makeWrapper ];

30+

31+ buildInputs = [ bash glibc openssl libGLU libGL freetype

32+ xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];

33+

34+ LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath

35+ [ cairo libGLU libGL freetype openssl libuuid alsaLib

36+ xorg.libICE xorg.libSM ];

37+

1438 preConfigure = ''

1539 cd build/

1640 '';

@@ -46,12 +70,9 @@ stdenv.mkDerivation rec {

4670 ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name

4771 '';

4872

49− LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ];

50− nativeBuildInputs = [ unzip cmake gcc makeWrapper ];

51− buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];

52−

53− meta = {

73+ meta = with stdenv.lib; {

5474 description = "Clean and innovative Smalltalk-inspired environment";

75+ homepage = "https://pharo.org";

5576 longDescription = ''

5677 Pharo's goal is to deliver a clean, innovative, free open-source

5778 Smalltalk-inspired environment. By providing a stable and small core

@@ -65,9 +86,8 @@ stdenv.mkDerivation rec {

6586 Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu

6687 packaging (ppa:pharo/stable)' project.

6788 '';

68− homepage = "http://pharo.org";

69− license = stdenv.lib.licenses.mit;

70− maintainers = [ stdenv.lib.maintainers.lukego ];

89+ license = licenses.mit;

90+ maintainers = [ maintainers.lukego ];

7191 # Pharo VM sources are packaged separately for darwin (OS X)

7292 platforms = stdenv.lib.filter

7393 (system: with stdenv.lib.systems.elaborate { inherit system; };

pkgs/development/pharo/vm/build-vm.nix+28−28

@@ -46,6 +46,33 @@ stdenv.mkDerivation rec {

4646 # while the VM depends on <= gcc48:

4747 "stackprotector" ];

4848

49+ # gcc 4.8 used for the build:

50+ #

51+ # gcc5 crashes during compilation; gcc >= 4.9 produces a

52+ # binary that crashes when forking a child process. See:

53+ # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html

54+ #

55+ # (stack protection is disabled above for gcc 4.8 compatibility.)

56+ nativeBuildInputs = [ autoreconfHook ];

57+ buildInputs = [

58+ bash

59+ unzip

60+ glibc

61+ openssl

62+ gcc48

63+ libGLU libGL

64+ freetype

65+ xorg.libX11

66+ xorg.libICE

67+ xorg.libSM

68+ alsaLib

69+ cairo

70+ pharo-share

71+ libuuid

72+ ];

73+

74+ enableParallelBuilding = true;

75+

4976 # Regenerate the configure script.

5077 # Unnecessary? But the build breaks without this.

5178 autoreconfPhase = ''

@@ -123,35 +150,9 @@ stdenv.mkDerivation rec {

123150 ln -s ${libgit2}/lib/libgit2.so* "$out/"

124151 '';

125152

126− enableParallelBuilding = true;

127−

128− # gcc 4.8 used for the build:

129− #

130− # gcc5 crashes during compilation; gcc >= 4.9 produces a

131− # binary that crashes when forking a child process. See:

132− # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html

133− #

134− # (stack protection is disabled above for gcc 4.8 compatibility.)

135− nativeBuildInputs = [ autoreconfHook ];

136− buildInputs = [

137− bash

138− unzip

139− glibc

140− openssl

141− gcc48

142− libGLU libGL

143− freetype

144− xorg.libX11

145− xorg.libICE

146− xorg.libSM

147− alsaLib

148− cairo

149− pharo-share

150− libuuid

151− ];

152−

153153 meta = with stdenv.lib; {

154154 description = "Clean and innovative Smalltalk-inspired environment";

155+ homepage = "https://pharo.org";

155156 longDescription = ''

156157 Pharo's goal is to deliver a clean, innovative, free open-source

157158 Smalltalk-inspired environment. By providing a stable and small core

@@ -165,7 +166,6 @@ stdenv.mkDerivation rec {

165166 Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu

166167 packaging (ppa:pharo/stable)' project.

167168 '';

168− homepage = "http://pharo.org";

169169 license = licenses.mit;

170170 maintainers = [ maintainers.lukego ];

171171 platforms = [ "i686-linux" "x86_64-linux" ];

pkgs/development/pharo/vm/share.nix+1−1

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {

5151

5252 meta = {

5353 description = "Shared files for Pharo";

54− homepage = "http://pharo.org";

54+ homepage = "https://pharo.org";

5555 license = stdenv.lib.licenses.mit;

5656 maintainers = [ ];

5757 };