diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/pharo')
4 files changed, 62 insertions, 43 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/pharo/launcher/default.nix b/infra/libkookie/nixpkgs/pkgs/development/pharo/launcher/default.nix index 5f6deca863c3..1737fb90c7ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/pharo/launcher/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/pharo/launcher/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { test "$?" == 124 && echo "ok") ''; - meta = { + meta = with stdenv.lib; { description = "Launcher for Pharo distributions"; + homepage = "https://pharo.org"; longDescription = '' - Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core system, excellent dev tools, and maintained releases, Pharo @@ -75,8 +75,7 @@ stdenv.mkDerivation rec { access it very rapidly from your OS application launcher. As a result, launching any image is never more than 3 clicks away. ''; - homepage = "http://pharo.org"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = [ ]; platforms = pharo.meta.platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix index fd6312c7b273..13db30eae909 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,20 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv +, fetchurl +, cmake +, bash +, unzip +, glibc +, openssl +, gcc +, libGLU +, libGL +, freetype +, xorg +, alsaLib +, cairo +, libuuid +, makeWrapper +, ... }: { name, src, ... }: @@ -10,7 +26,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "pic" ]; - # Building + nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; + + buildInputs = [ bash glibc openssl libGLU libGL freetype + xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath + [ cairo libGLU libGL freetype openssl libuuid alsaLib + xorg.libICE xorg.libSM ]; + preConfigure = '' cd build/ ''; @@ -46,12 +70,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; - nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; - - meta = { + meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; + homepage = "https://pharo.org"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core @@ -65,9 +86,8 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = "http://pharo.org"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; + license = licenses.mit; + maintainers = [ maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) platforms = stdenv.lib.filter (system: with stdenv.lib.systems.elaborate { inherit system; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm.nix b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm.nix index 4bc60dde410f..d5469233f387 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/build-vm.nix @@ -46,6 +46,33 @@ stdenv.mkDerivation rec { # while the VM depends on <= gcc48: "stackprotector" ]; + # gcc 4.8 used for the build: + # + # gcc5 crashes during compilation; gcc >= 4.9 produces a + # binary that crashes when forking a child process. See: + # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html + # + # (stack protection is disabled above for gcc 4.8 compatibility.) + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + bash + unzip + glibc + openssl + gcc48 + libGLU libGL + freetype + xorg.libX11 + xorg.libICE + xorg.libSM + alsaLib + cairo + pharo-share + libuuid + ]; + + enableParallelBuilding = true; + # Regenerate the configure script. # Unnecessary? But the build breaks without this. autoreconfPhase = '' @@ -123,35 +150,9 @@ stdenv.mkDerivation rec { ln -s ${libgit2}/lib/libgit2.so* "$out/" ''; - enableParallelBuilding = true; - - # gcc 4.8 used for the build: - # - # gcc5 crashes during compilation; gcc >= 4.9 produces a - # binary that crashes when forking a child process. See: - # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html - # - # (stack protection is disabled above for gcc 4.8 compatibility.) - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - bash - unzip - glibc - openssl - gcc48 - libGLU libGL - freetype - xorg.libX11 - xorg.libICE - xorg.libSM - alsaLib - cairo - pharo-share - libuuid - ]; - meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; + homepage = "https://pharo.org"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core @@ -165,7 +166,6 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = "http://pharo.org"; license = licenses.mit; maintainers = [ maintainers.lukego ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/share.nix b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/share.nix index ee7a0494ede6..2c8c376b7c12 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/share.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/pharo/vm/share.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared files for Pharo"; - homepage = "http://pharo.org"; + homepage = "https://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; }; |