From 24da3b0f353f24c84ebc8a615e32fde59270a48c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 17:56:57 +0200 Subject: [PATCH 1/4] openraPackages: fix error: makeWrapper/makeShellWrapper must be in nativeBuildInputs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b5f22705b9..f02b6463a00f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34836,7 +34836,7 @@ with pkgs; otto-matic = callPackage ../games/otto-matic { }; - openraPackages = import ../games/openra pkgs; + openraPackages = import ../games/openra pkgs.__splicedPackages; openra = openraPackages.engines.release; From df45ce900072e152c06b4e2a6da06c78db19a49f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 18:02:03 +0200 Subject: [PATCH 2/4] icr: remove unnecessary adding of makeWrapper to path makeWrapper doesn't contain binaries so this doesn't do anything --- pkgs/development/tools/icr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 095055cbedce..50a496d93824 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; { From 835d525361fb19f25eaaacc41524287fb833f928 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 18:10:11 +0200 Subject: [PATCH 3/4] yarn2nix: fix splicing --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f02b6463a00f..609d34c86e50 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; }; }; From d86a6778a4fa998dcee7d0e4b40bec0dae151979 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Jan 2023 21:20:45 +0200 Subject: [PATCH 4/4] vscode: fix makeWrapper/makeShellWrapper must be in nativeBuildInputs --- pkgs/applications/editors/vscode/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index c41fcb4f4e34..c4d975ad265a 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;