diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 18:59:21 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 18:59:21 -0500 |
| commit | cb8349f59f8e3bf658865b5bc34f07c4e8868bc3 (patch) | |
| tree | 49eeca4251579f981e3d113bc70e638dd3ea3009 /pkgs | |
| parent | ab651d2c9bab620ebe5e515476fbd70d2c5b0c61 (diff) | |
| parent | 1531fd7351f6d0767a64816963fd82c31833788d (diff) | |
| download | nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar.gz nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar.bz2 nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar.lz nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar.xz nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.tar.zst nixpkgs-cb8349f59f8e3bf658865b5bc34f07c4e8868bc3.zip | |
Merge branch 'pharo' into ericson2314-cross-base
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/pharo/vm/build-vm.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 74fa75e7aa5..b72b1851024 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { else if stdenv.isLinux && stdenv.isx86_64 then "linux64x64" else if stdenv.isDarwin && stdenv.isi686 then "macos32x86" else if stdenv.isDarwin && stdenv.isx86_64 then "macos64x64" - else abort "Unsupported platform: only Linux/Darwin x86/x64 are supported."; + else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; # Shared data (for the sources file) pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; - meta = { + meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source @@ -122,8 +122,8 @@ stdenv.mkDerivation rec { packaging (ppa:pharo/stable)' project. ''; homepage = http://pharo.org; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; - platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ]; + license = licenses.mit; + maintainers = [ maintainers.lukego ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } |