pharo: Tighten source and simplify meta.platforms

+13 -9
+4 -4
pkgs/development/pharo/vm/build-vm-legacy.nix
··· 70 license = stdenv.lib.licenses.mit; 71 maintainers = [ stdenv.lib.maintainers.lukego ]; 72 # Pharo VM sources are packaged separately for darwin (OS X) 73 - platforms = with stdenv.lib; 74 - intersectLists 75 - platforms.mesaPlatforms 76 - (subtractLists platforms.darwin platforms.unix); 77 }; 78 }
··· 70 license = stdenv.lib.licenses.mit; 71 maintainers = [ stdenv.lib.maintainers.lukego ]; 72 # Pharo VM sources are packaged separately for darwin (OS X) 73 + platforms = stdenv.lib.filter 74 + (system: with stdenv.lib.systems.elaborate { inherit system; }; 75 + isUnix && !isDarwin) 76 + stdenv.lib.platforms.mesaPlatforms; 77 }; 78 }
+9 -5
pkgs/development/pharo/wrapper/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 name = "pharo"; 5 - src = ./.; 6 inherit cog32 spur32 spur64 file; 7 magic = ./magic; 8 desktopItem = makeDesktopItem { ··· 17 categories = "Development;"; 18 mimeType = "application/x-pharo-image"; 19 }; 20 buildPhase = '' 21 substituteAllInPlace ./pharo-vm.sh 22 ''; ··· 49 license = stdenv.lib.licenses.mit; 50 maintainers = [ stdenv.lib.maintainers.lukego ]; 51 # Pharo VM sources are packaged separately for darwin (OS X) 52 - platforms = with stdenv.lib; 53 - intersectLists 54 - platforms.mesaPlatforms 55 - (subtractLists platforms.darwin platforms.unix); 56 }; 57 } 58
··· 2 3 stdenv.mkDerivation rec { 4 name = "pharo"; 5 + src = ./pharo-vm.sh; 6 inherit cog32 spur32 spur64 file; 7 magic = ./magic; 8 desktopItem = makeDesktopItem { ··· 17 categories = "Development;"; 18 mimeType = "application/x-pharo-image"; 19 }; 20 + unpackPhase = '' 21 + cp $src ./pharo-vm.sh 22 + sourceRoot=$PWD 23 + ''; 24 buildPhase = '' 25 substituteAllInPlace ./pharo-vm.sh 26 ''; ··· 53 license = stdenv.lib.licenses.mit; 54 maintainers = [ stdenv.lib.maintainers.lukego ]; 55 # Pharo VM sources are packaged separately for darwin (OS X) 56 + platforms = stdenv.lib.filter 57 + (system: with stdenv.lib.systems.elaborate { inherit system; }; 58 + isUnix && !isDarwin) 59 + stdenv.lib.platforms.mesaPlatforms; 60 }; 61 } 62