pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #130044 from Mindavi/bugfix/makewrapper-fixes

Move makeWrapper to nativeBuildInputs for some packages

authored by Dmitry Kalinkin and committed by GitHub c1497725 43ae7773

+15 -13
unified split
+1 -2
pkgs/applications/misc/freeplane/default.nix
··· 86 in stdenv.mkDerivation rec { 87 inherit pname version src; 88 89 - buildInputs = [ makeWrapper ]; 90 - nativeBuildInputs = [ jdk11 gradle_5 ]; 91 92 buildPhase = '' 93 mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
··· 86 in stdenv.mkDerivation rec { 87 inherit pname version src; 88 89 + nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ]; 90 91 buildPhase = '' 92 mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
+2 -2
pkgs/applications/misc/variety/default.nix
··· 26 sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; 27 }; 28 29 - nativeBuildInputs = [ intltool wrapGAppsHook ]; 30 31 - buildInputs = [ makeWrapper distutils_extra ]; 32 33 doCheck = false; 34
··· 26 sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; 27 }; 28 29 + nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ]; 30 31 + buildInputs = [ distutils_extra ]; 32 33 doCheck = false; 34
+2 -1
pkgs/applications/networking/browsers/firefox/common.nix
··· 170 xorg.pixman yasm libGLU libGL 171 xorg.xorgproto 172 xorg.libXdamage 173 - xorg.libXext makeWrapper 174 libevent libstartup_notification /* cairo */ 175 libpng jemalloc glib 176 nasm icu67 libvpx_1_8 ··· 224 cargo 225 gnused 226 llvmPackages.llvm # llvm-objdump 227 nodejs 228 perl 229 pkg-config
··· 170 xorg.pixman yasm libGLU libGL 171 xorg.xorgproto 172 xorg.libXdamage 173 + xorg.libXext 174 libevent libstartup_notification /* cairo */ 175 libpng jemalloc glib 176 nasm icu67 libvpx_1_8 ··· 224 cargo 225 gnused 226 llvmPackages.llvm # llvm-objdump 227 + makeWrapper 228 nodejs 229 perl 230 pkg-config
+1 -1
pkgs/games/0ad/wrapper.nix
··· 6 name = "zeroad-${zeroad-unwrapped.version}"; 7 inherit (zeroad-unwrapped) meta; 8 9 - buildInputs = [ makeWrapper ]; 10 11 paths = [ zeroad-unwrapped zeroad-data ]; 12
··· 6 name = "zeroad-${zeroad-unwrapped.version}"; 7 inherit (zeroad-unwrapped) meta; 8 9 + nativeBuildInputs = [ makeWrapper ]; 10 11 paths = [ zeroad-unwrapped zeroad-data ]; 12
+1 -1
pkgs/games/flare/default.nix
··· 8 (callPackage ./game.nix {}) 9 ]; 10 11 - buildInputs = [ makeWrapper ]; 12 postBuild = '' 13 mkdir -p $out/bin 14 makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare"
··· 8 (callPackage ./game.nix {}) 9 ]; 10 11 + nativeBuildInputs = [ makeWrapper ]; 12 postBuild = '' 13 mkdir -p $out/bin 14 makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare"
+1 -1
pkgs/games/iortcw/default.nix
··· 12 13 pathsToLink = [ "/opt" ]; 14 15 - buildInputs = [ makeWrapper ]; 16 17 # so we can launch sp from mp game and vice versa 18 postBuild = ''
··· 12 13 pathsToLink = [ "/opt" ]; 14 15 + nativeBuildInputs = [ makeWrapper ]; 16 17 # so we can launch sp from mp game and vice versa 18 postBuild = ''
+1 -1
pkgs/games/uchess/default.nix
··· 18 # package does not contain any tests as of v0.2.1 19 doCheck = false; 20 21 - buildInputs = [ makeWrapper ]; 22 postInstall = '' 23 wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin 24 '';
··· 18 # package does not contain any tests as of v0.2.1 19 doCheck = false; 20 21 + nativeBuildInputs = [ makeWrapper ]; 22 postInstall = '' 23 wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin 24 '';
+1 -1
pkgs/tools/cd-dvd/brasero/wrapper.nix
··· 6 name = "brasero-${brasero-original.version}"; 7 8 paths = [ brasero-original ]; 9 - buildInputs = [ makeWrapper ]; 10 11 postBuild = '' 12 wrapProgram $out/bin/brasero \
··· 6 name = "brasero-${brasero-original.version}"; 7 8 paths = [ brasero-original ]; 9 + nativeBuildInputs = [ makeWrapper ]; 10 11 postBuild = '' 12 wrapProgram $out/bin/brasero \
+1 -1
pkgs/tools/inputmethods/fcitx/wrapper.nix
··· 5 6 paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; 7 8 - buildInputs = [ makeWrapper ]; 9 10 postBuild = '' 11 wrapProgram $out/bin/fcitx \
··· 5 6 paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; 7 8 + nativeBuildInputs = [ makeWrapper ]; 9 10 postBuild = '' 11 wrapProgram $out/bin/fcitx \
+2 -1
pkgs/tools/text/gawk/gawk-with-extensions.nix
··· 1 { runCommand, gawk, extensions, makeWrapper }: 2 3 runCommand "gawk-with-extensions" { 4 - buildInputs = [ makeWrapper gawk ] ++ extensions; 5 } '' 6 mkdir -p $out/bin 7 for i in ${gawk}/bin/*; do
··· 1 { runCommand, gawk, extensions, makeWrapper }: 2 3 runCommand "gawk-with-extensions" { 4 + nativeBuildInputs = [ makeWrapper ]; 5 + buildInputs = [ gawk ] ++ extensions; 6 } '' 7 mkdir -p $out/bin 8 for i in ${gawk}/bin/*; do
+2 -1
pkgs/tools/typesetting/tex/texlive/combine.nix
··· 50 "/tex/generic/config" # make it a real directory for scheme-infraonly 51 ]; 52 53 - buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; 54 55 # This is set primarily to help find-tarballs.nix to do its job 56 passthru.packages = pkgList.all;
··· 50 "/tex/generic/config" # make it a real directory for scheme-infraonly 51 ]; 52 53 + nativeBuildInputs = [ makeWrapper ]; 54 + buildInputs = [ ] ++ pkgList.extraInputs; 55 56 # This is set primarily to help find-tarballs.nix to do its job 57 passthru.packages = pkgList.all;