diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 18:54:35 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 18:54:35 -0500 |
commit | 2b4502c78eee1426ae1762271145193f79feaeab (patch) | |
tree | 7e25bd6f2befbf1947eaa105a3c3612a454f79a6 | |
parent | 0bc1642fb87041a7f4288ce2219ac6ebdb517a7c (diff) | |
parent | 1531fd7351f6d0767a64816963fd82c31833788d (diff) | |
download | nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar.gz nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar.bz2 nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar.lz nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar.xz nixlib-2b4502c78eee1426ae1762271145193f79feaeab.tar.zst nixlib-2b4502c78eee1426ae1762271145193f79feaeab.zip |
Merge @LnL7's pharo-vm darwin eval fix from staging
Not a mass-rebuild
-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 74fa75e7aa56..b72b1851024a 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" ]; }; } |