Unverified Commit 3deb4e18 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu Committed by GitHub
Browse files

envision-unwrapped: 0-unstable-2024-09-28 -> 0-unstable-2024-10-20; envision:... 

envision-unwrapped: 0-unstable-2024-09-28 -> 0-unstable-2024-10-20; envision: update dependency list and extraInstallCommands (#349917)
parents 8dedccea 422081d2

pkgs/by-name/en/envision-unwrapped/Cargo.lock

deleted100644 → 0
+0 −2712

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/en/envision-unwrapped/package.nix

+6 −9
Original line number Diff line number Diff line
@@ -31,23 +31,20 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "envision-unwrapped";

  version = "0-unstable-2024-09-28";

  version = "0-unstable-2024-10-20";



  src = fetchFromGitLab {

    owner = "gabmus";

    repo = "envision";

    rev = "56d500a9f914ce2ddad038223711192e4d1dcbe1";

    hash = "sha256-8wU2sjhH026l6a11XZ5Qdu5x/EbI+ZqwE7AixsYMCFk=";

    rev = "c40a4ad05a8e6ea99eed4a7d7d2098a08686e065";

    hash = "sha256-C/m5Hx52fFyuVI87EmHpe5YqjwDWoyveiXA0sJTt2NQ=";

  };



  strictDeps = true;



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y=";

      "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";

    };

  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit (finalAttrs) pname version src;

    hash = "sha256-I9UDCKrqU6TWcmHsSFwt1elplPwU+XTgyXiN2wtw5y0=";

  };



  nativeBuildInputs = [

pkgs/by-name/en/envision/package.nix

+7 −26
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ buildFHSEnv { 
    pkgs:

    [ pkgs.envision-unwrapped ]

    ++ (with pkgs; [

      glibc

      stdenv.cc.libc

      gcc

    ])

    ++ (
@@ -24,7 +24,7 @@ buildFHSEnv { 
    )

    ++ (

      # OpenComposite dependencies

      pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost186 ]

      pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs

    )

    ++ (

      # Monado dependencies
@@ -59,27 +59,12 @@ buildFHSEnv { 
      [ pkgs.zlib ])

    ++ (

      # WiVRn dependencies

      # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged

      (with pkgs; [

        avahi

        cmake

        cli11

        ffmpeg

        git

        gst_all_1.gstreamer

        gst_all_1.gst-plugins-base

      pkgs.wivrn.buildInputs

      ++ pkgs.wivrn.nativeBuildInputs

      ++ (with pkgs; [

        glib

        libmd

        libdrm

        libpulseaudio

        libva

        ninja

        nlohmann_json

        openxr-loader

        pipewire

        systemdLibs # udev

        vulkan-loader

        vulkan-headers

        x264

      ])

      ++ (with pkgs; [

        android-tools # For adb installing WiVRn APKs
@@ -93,11 +78,7 @@ buildFHSEnv { 
  '';



  extraInstallCommands = ''

    mkdir -p $out/share/applications $out/share/metainfo

    ln -s ${envision-unwrapped}/share/envision $out/share

    ln -s ${envision-unwrapped}/share/icons $out/share

    ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications

    ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo

    ln -s ${envision-unwrapped}/share $out/share

  '';



  runScript = "envision";