Unverified Commit 9b576399 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #209510 from Artturin/splicefixes1

parents b3a1a805 d86a6778

pkgs/applications/editors/vscode/generic.nix

+3 −2
Original line number Diff line number Diff line 
{ stdenv, lib, makeDesktopItem

, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper

, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages

, atomEnv, at-spi2-atk, autoPatchelfHook

, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland
@@ -72,7 +72,8 @@ let 
      ++ lib.optionals stdenv.isLinux [

        autoPatchelfHook

        nodePackages.asar

        (wrapGAppsHook.override { inherit makeWrapper; })

        # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651

        (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; })

      ];



    dontBuild = true;

pkgs/development/tools/icr/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ crystal.buildCrystalPackage rec { 


  postFixup = ''

    wrapProgram $out/bin/icr \

      --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}

      --prefix PATH : ${lib.makeBinPath [ crystal shards which ]}

  '';



  meta = with lib; {

pkgs/top-level/all-packages.nix

+3 −2
Original line number Diff line number Diff line
@@ -13386,8 +13386,9 @@ with pkgs; 














  yarn = callPackage ../development/tools/yarn  { };



























  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };













  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };















  yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix {













    pkgs = pkgs.__splicedPackages;















    nodejs = nodejs.override { openssl = openssl_1_1; };















  };
























@@ -34851,7 +34852,7 @@ with pkgs;



























  otto-matic = callPackage ../games/otto-matic { };



























  openraPackages = import ../games/openra pkgs;













  openraPackages = import ../games/openra pkgs.__splicedPackages;





























  openra = openraPackages.engines.release;