From b7642726f98375eb8f9bdda4cabd7d82376144d7 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Tue, 19 Apr 2022 19:30:27 +1000 Subject: [PATCH] unigine-valley: add desktop icon and change libGL to libglvnd --- .../graphics/unigine-valley/default.nix | 183 ++++++++++-------- 1 file changed, 102 insertions(+), 81 deletions(-) diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 81ed98f9ad44..9b51373178e4 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -1,10 +1,15 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl -# Build-time dependencies + # Build-time dependencies , makeWrapper , file +, makeDesktopItem +, imagemagick +, copyDesktopItems -# Runtime dependencies + # Runtime dependencies , fontconfig , freetype , libX11 @@ -12,104 +17,120 @@ , libXinerama , libXrandr , libXrender -, libGL -, openal}: +, libglvnd +, openal +}: let version = "1.0"; - arch = if stdenv.hostPlatform.system == "x86_64-linux" then - "x64" - else if stdenv.hostPlatform.system == "i686-linux" then - "x86" - else - throw "Unsupported platform ${stdenv.hostPlatform.system}"; - + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then + "x64" + else if stdenv.hostPlatform.system == "i686-linux" then + "x86" + else + throw "Unsupported platform ${stdenv.hostPlatform.system}"; in - stdenv.mkDerivation rec { - pname = "unigine-valley"; - inherit version; - src = fetchurl { - url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; - sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; - }; +stdenv.mkDerivation rec { + pname = "unigine-valley"; + inherit version; - sourceRoot = "Unigine_Valley-${version}"; - instPath = "lib/unigine/valley"; + src = fetchurl { + url = "https://m11-assets.unigine.com/d/Unigine_Valley-${version}.run"; + sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; + }; - nativeBuildInputs = [file makeWrapper]; + sourceRoot = "Unigine_Valley-${version}"; + instPath = "lib/unigine/valley"; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc # libstdc++.so.6 - fontconfig - freetype - libX11 - libXext - libXinerama - libXrandr - libXrender - libGL - openal - ]; + nativeBuildInputs = [ file makeWrapper imagemagick copyDesktopItems ]; - unpackPhase = '' - runHook preUnpack + libPath = lib.makeLibraryPath [ + stdenv.cc.cc # libstdc++.so.6 + fontconfig + freetype + libX11 + libXext + libXinerama + libXrandr + libXrender + libglvnd + openal + ]; - cp $src extractor.run - chmod +x extractor.run - ./extractor.run --target $sourceRoot + unpackPhase = '' + runHook preUnpack - runHook postUnpack - ''; + cp $src extractor.run + chmod +x extractor.run + ./extractor.run --target $sourceRoot - patchPhase = '' - runHook prePatch + runHook postUnpack + ''; - # Patch ELF files. - elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) - for elf in $elfs; do - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true - done + postPatch = '' + # Patch ELF files. + elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) + for elf in $elfs; do + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true + done + ''; - runHook postPatch - ''; + installPhase = '' + runHook preInstall - installPhase = '' - runHook preInstall + instdir=$out/${instPath} + mkdir -p $out/share/icons/hicolor $out/share/applications $out/bin $instdir/bin - instdir=$out/${instPath} + # Install executables and libraries + install -m 0755 bin/browser_${arch} $instdir/bin + install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin + install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin + install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin + install -m 0755 bin/libUnigine_${arch}.so $instdir/bin + install -m 0755 bin/valley_${arch} $instdir/bin + install -m 0755 valley $instdir + install -m 0755 valley $out/bin/valley - # Install executables and libraries - mkdir -p $instdir/bin - install -m 0755 bin/browser_${arch} $instdir/bin - install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin - install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin - install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin - install -m 0755 bin/libUnigine_${arch}.so $instdir/bin - install -m 0755 bin/valley_${arch} $instdir/bin - install -m 0755 valley $instdir + # Install other files + cp -R data documentation $instdir - # Install other files - cp -R data documentation $instdir + # Install and wrap executable + wrapProgram $out/bin/valley \ + --chdir "$instdir" \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath - # Install and wrap executable - mkdir -p $out/bin - install -m 0755 valley $out/bin/valley - wrapProgram $out/bin/valley \ - --chdir "$instdir" \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath + # Make desktop Icon + convert $out/lib/unigine/valley/data/launcher/icon.png -resize 128x128 $out/share/icons/Valley.png + for RES in 16 24 32 48 64 128 256 + do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert $out/lib/unigine/valley/data/launcher/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Valley.png + done - runHook postInstall - ''; + runHook postInstall + ''; - stripDebugList = ["${instPath}/bin"]; + desktopItems = [ + (makeDesktopItem { + name = "Valley"; + exec = "valley"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Valley"; + desktopName = "Valley Benchmark"; + }) + ]; + + stripDebugList = [ "${instPath}/bin" ]; + + meta = { + description = "The Unigine Valley GPU benchmarking tool"; + homepage = "https://unigine.com/products/benchmarks/valley/"; + license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf + maintainers = [ lib.maintainers.kierdavis ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} - meta = { - description = "The Unigine Valley GPU benchmarking tool"; - homepage = "https://unigine.com/products/benchmarks/valley/"; - license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ lib.maintainers.kierdavis ]; - platforms = ["x86_64-linux" "i686-linux"]; - }; - }