Commit 976e5387 authored by Artturin's avatar Artturin
Browse files

treewide: Fix `error: makeWrapper/makeShellWrapper must be in nativeBuildInputs` 

On cross
parent 5176f640

pkgs/applications/editors/vscode/generic.nix

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ in 
    asar

    copyDesktopItems

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

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

    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.

    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })

  ];



  dontBuild = true;

pkgs/applications/networking/browsers/brave/make-brave.nix

+4 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper

{ lib, stdenv, fetchurl, buildPackages

, alsa-lib

, at-spi2-atk

, at-spi2-core
@@ -112,7 +112,9 @@ stdenv.mkDerivation { 


  nativeBuildInputs = [

    dpkg

    (wrapGAppsHook3.override { inherit makeWrapper; })

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

    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.

    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })

  ];



  buildInputs = [

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

+4 −3
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
, asar

, rsync

, python3

, wrapGAppsHook3

, makeWrapper

, buildPackages

, nixosTests

, gtk3

, atk
@@ -127,7 +126,9 @@ stdenv.mkDerivation rec { 
    asar

    python3

    autoPatchelfHook

    (wrapGAppsHook3.override { inherit makeWrapper; })

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

    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.

    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })

  ];



  buildInputs = [

pkgs/applications/version-management/gitkraken/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
  makeDesktopItem,

  openssl,

  wrapGAppsHook3,

  makeShellWrapper,

  buildPackages,

  at-spi2-atk,

  at-spi2-core,

  libuuid,
@@ -166,7 +166,9 @@ let 


    nativeBuildInputs = [

      copyDesktopItems

      (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; })

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

      # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.

      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })

    ];

    buildInputs = [

      gtk3

pkgs/by-name/gi/github-desktop/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
, lib

, fetchurl

, autoPatchelfHook

, wrapGAppsHook3

, makeWrapper

, buildPackages

, gnome-keyring

, libsecret

, git
@@ -44,7 +43,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    autoPatchelfHook

    (wrapGAppsHook3.override { inherit makeWrapper; })

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

    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.

    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })

  ];



  buildInputs = [