Merge branch 'pharo' into ericson2314-cross-base

+5 -5
+5 -5
pkgs/development/pharo/vm/build-vm.nix
··· 20 20 else if stdenv.isLinux && stdenv.isx86_64 then "linux64x64" 21 21 else if stdenv.isDarwin && stdenv.isi686 then "macos32x86" 22 22 else if stdenv.isDarwin && stdenv.isx86_64 then "macos64x64" 23 - else abort "Unsupported platform: only Linux/Darwin x86/x64 are supported."; 23 + else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; 24 24 25 25 # Shared data (for the sources file) 26 26 pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; ··· 106 106 nativeBuildInputs = [ autoreconfHook ]; 107 107 buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; 108 108 109 - meta = { 109 + meta = with stdenv.lib; { 110 110 description = "Clean and innovative Smalltalk-inspired environment"; 111 111 longDescription = '' 112 112 Pharo's goal is to deliver a clean, innovative, free open-source ··· 122 122 packaging (ppa:pharo/stable)' project. 123 123 ''; 124 124 homepage = http://pharo.org; 125 - license = stdenv.lib.licenses.mit; 126 - maintainers = [ stdenv.lib.maintainers.lukego ]; 127 - platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ]; 125 + license = licenses.mit; 126 + maintainers = [ maintainers.lukego ]; 127 + platforms = [ "i686-linux" "x86_64-linux" ]; 128 128 }; 129 129 }