diff options
| author | Artturi <Artturin@artturin.com> | 2023-01-09 19:43:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 19:43:38 +0200 |
| commit | 9b57639919e127a1fe5295ce59fc4cf7a67d975b (patch) | |
| tree | d0327fd8704ac530cb6aaf35bd9e86a075b8cd75 | |
| parent | b3a1a8050f59bd94dc00685593014b2108cb842d (diff) | |
| parent | d86a6778a4fa998dcee7d0e4b40bec0dae151979 (diff) | |
Merge pull request #209510 from Artturin/splicefixes1
| -rw-r--r-- | pkgs/applications/editors/vscode/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/icr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index ef9d49c5d1572..1b4f4508fbf0b 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { 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; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 095055cbedce3..50a496d93824b 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffde8e34ba6a..e58a55279e4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |