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

Merge pull request #57201 from tesq0/pull-request-unity

Browse Source 
unity3d: 2017.4.10f1 -> 2018.3.0f2
This commit is contained in:
Timo Kaufmann 2019-04-11 17:07:56 +02:00 committed by GitHub
commit 0550927c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -5461,4 +5461,9 @@
github = "freezeboy"; github = "freezeboy";
name = "freezeboy"; name = "freezeboy";
}; };
tesq0 = {
email = "mikolaj.galkowski@gmail.com";
github = "tesq0";
name = "Mikolaj Galkowski";
};
} }

17
pkgs/development/tools/unity3d/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl, makeWrapper, file, getopt { stdenv, lib, fetchurl, makeWrapper, file, getopt
, gtk2, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb , gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
, libpqxx
}: }:
let let
@ -13,20 +14,21 @@ let
cairo dbus expat zlib libpng12 udev tbb cairo dbus expat zlib libpng12 udev tbb
libX11 libXcursor libXdamage libXfixes libXrender libXi libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb libXcomposite libXext libXrandr libXtst libSM libICE libxcb
libpqxx gtk3
]; ];
libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
binPath = lib.makeBinPath [ nodejs gnutar ]; binPath = lib.makeBinPath [ nodejs gnutar ];
ver = "2017.4.10"; ver = "2018.3.0";
build = "f1"; build = "f2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "unity-editor-${version}"; name = "unity-editor-${version}";
version = "${ver}x${build}"; version = "${ver}x${build}";
src = fetchurl { src = fetchurl {
url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz"; url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
}; };
nosuidLib = ./unity-nosuid.c; nosuidLib = ./unity-nosuid.c;
@ -79,7 +81,8 @@ in stdenv.mkDerivation rec {
fi fi
} }
upm_linux=$unitydir/Data/Resources/Upm/upm-linux upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager
orig_size=$(stat --printf=%s $upm_linux) orig_size=$(stat --printf=%s $upm_linux)
@ -132,6 +135,6 @@ in stdenv.mkDerivation rec {
''; '';
license = licenses.unfree; license = licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ jb55 ]; maintainers = with maintainers; [ jb55 tesq0 ];
}; };
} }