nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
On cross
This commit is contained in:
Artturin 2024-09-26 03:46:28 +03:00
parent 5176f640ee
commit 976e5387d2
8 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/vscode/generic.nix
View File

@ -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;

6
pkgs/applications/networking/browsers/brave/make-brave.nix
View File

@ -1,4 +1,4 @@
{ 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 = [

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

@ -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 = [

6
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -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

7
pkgs/by-name/gi/github-desktop/package.nix
View File

@ -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 = [

4
pkgs/by-name/pa/paper-plane/package.nix
View File

@ -1,7 +1,6 @@
{ lib
, fetchFromGitHub
, gtk4
, wrapGAppsHook3
, libadwaita
, tdlib
, rlottie
@ -18,6 +17,7 @@
, libshumate
, gst_all_1
, darwin
, buildPackages
}:
let
@ -36,7 +36,7 @@ let
gtk4-paperplane = gtk4.overrideAttrs (prev: {
patches = (prev.patches or []) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ];
});
wrapPaperPlaneHook = wrapGAppsHook3.override {
wrapPaperPlaneHook = buildPackages.wrapGAppsHook3.override {
gtk3 = gtk4-paperplane;
};
# libadwaita has gtk4 in propagatedBuildInputs so it must be overrided

6
pkgs/development/tools/nwjs/default.nix
View File

@ -3,6 +3,7 @@
, atk
, autoPatchelfHook
, buildEnv
, buildPackages
, cairo
, cups
, dbus
@ -32,7 +33,6 @@
, stdenv
, systemd
, udev
, wrapGAppsHook3
, xorg
}:
@ -107,7 +107,9 @@ stdenv.mkDerivation {
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 = [ nwEnv ];

16
pkgs/development/web/cypress/default.nix
View File

@ -4,13 +4,13 @@
, gtk2
, gtk3
, lib
, buildPackages
, makeShellWrapper
, mesa
, nss
, stdenv
, udev
, unzip
, wrapGAppsHook3
, xorg
, darwin
}:
@ -46,8 +46,18 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps
dontPatchELF = true;
nativeBuildInputs = [ unzip makeShellWrapper ]
++ lib.optionals stdenv.isLinux [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ];
nativeBuildInputs =
[
unzip
makeShellWrapper
]
++ lib.optionals stdenv.isLinux [
autoPatchelfHook
# 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 = lib.optionals stdenv.isLinux (with xorg; [
libXScrnSaver