public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pharo: Tighten source and simplify meta.platforms

Browse Source
This commit is contained in:
John Ericson 2018-03-12 15:18:25 -04:00
parent c208ca6387
commit b152dcf852
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/pharo/vm/build-vm-legacy.nix
View File

@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.lukego ]; maintainers = [ stdenv.lib.maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X) # Pharo VM sources are packaged separately for darwin (OS X)
platforms = with stdenv.lib; platforms = stdenv.lib.filter
intersectLists (system: with stdenv.lib.systems.elaborate { inherit system; };
platforms.mesaPlatforms isUnix && !isDarwin)
(subtractLists platforms.darwin platforms.unix); stdenv.lib.platforms.mesaPlatforms;
}; };
} }

14
pkgs/development/pharo/wrapper/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pharo"; name = "pharo";
src = ./.; src = ./pharo-vm.sh;
inherit cog32 spur32 spur64 file; inherit cog32 spur32 spur64 file;
magic = ./magic; magic = ./magic;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
categories = "Development;"; categories = "Development;";
mimeType = "application/x-pharo-image"; mimeType = "application/x-pharo-image";
}; };
unpackPhase = ''
cp $src ./pharo-vm.sh
sourceRoot=$PWD
'';
buildPhase = '' buildPhase = ''
substituteAllInPlace ./pharo-vm.sh substituteAllInPlace ./pharo-vm.sh
''; '';
@ -49,10 +53,10 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.lukego ]; maintainers = [ stdenv.lib.maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X) # Pharo VM sources are packaged separately for darwin (OS X)
platforms = with stdenv.lib; platforms = stdenv.lib.filter
intersectLists (system: with stdenv.lib.systems.elaborate { inherit system; };
platforms.mesaPlatforms isUnix && !isDarwin)
(subtractLists platforms.darwin platforms.unix); stdenv.lib.platforms.mesaPlatforms;
}; };
} }