lol

treewide: makeWrapper to nativeBuildInputs

this should be all of them other than the failed splices
found with nixpkgs-lint

Artturin 6910a4ee cbfc406a

+21 -17
+3 -1
maintainers/scripts/nix-generate-from-cpan.nix
··· 3 3 stdenv.mkDerivation { 4 4 name = "nix-generate-from-cpan-3"; 5 5 6 + nativeBuildInputs = [ makeWrapper ]; 7 + 6 8 buildInputs = with perlPackages; [ 7 - makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl 9 + perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl 8 10 ]; 9 11 10 12 phases = [ "installPhase" ];
+3 -1
nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
··· 23 23 runCommand "uvcdynctrl-udev-rules-${version}" 24 24 { 25 25 inherit dataPath; 26 - buildInputs = [ 26 + nativeBuildInputs = [ 27 27 makeWrapper 28 + ]; 29 + buildInputs = [ 28 30 libwebcam 29 31 ]; 30 32 dontPatchELF = true;
+1 -1
nixos/modules/programs/mininet.nix
··· 14 14 pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); 15 15 16 16 mnexecWrapped = pkgs.runCommand "mnexec-wrapper" 17 - { buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; } 17 + { nativeBuildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; } 18 18 '' 19 19 makeWrapper ${pkgs.mininet}/bin/mnexec \ 20 20 $out/bin/mnexec \
+1 -1
nixos/modules/services/audio/mopidy.nix
··· 14 14 name = "mopidy-with-extensions-${mopidy.version}"; 15 15 paths = closePropagation cfg.extensionPackages; 16 16 pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ]; 17 - buildInputs = [ makeWrapper ]; 17 + nativeBuildInputs = [ makeWrapper ]; 18 18 postBuild = '' 19 19 makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ 20 20 --prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}
+1 -1
nixos/modules/services/backup/borgbackup.nix
··· 116 116 original, name, set ? {} 117 117 }: 118 118 pkgs.runCommand "${name}-wrapper" { 119 - buildInputs = [ pkgs.makeWrapper ]; 119 + nativeBuildInputs = [ pkgs.makeWrapper ]; 120 120 } (with lib; '' 121 121 makeWrapper "${original}" "$out/bin/${name}" \ 122 122 ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}
+1 -1
nixos/modules/services/continuous-integration/hydra/default.nix
··· 42 42 makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv); 43 43 in pkgs.buildEnv rec { 44 44 name = "hydra-env"; 45 - buildInputs = [ pkgs.makeWrapper ]; 45 + nativeBuildInputs = [ pkgs.makeWrapper ]; 46 46 paths = [ cfg.package ]; 47 47 48 48 postBuild = ''
+1 -1
nixos/modules/services/misc/etebase-server.nix
··· 162 162 163 163 environment.systemPackages = with pkgs; [ 164 164 (runCommand "etebase-server" { 165 - buildInputs = [ makeWrapper ]; 165 + nativeBuildInputs = [ makeWrapper ]; 166 166 } '' 167 167 makeWrapper ${pythonEnv}/bin/etebase-server \ 168 168 $out/bin/etebase-server \
+2 -2
nixos/modules/services/misc/gitlab.nix
··· 190 190 191 191 gitlab-rake = pkgs.stdenv.mkDerivation { 192 192 name = "gitlab-rake"; 193 - buildInputs = [ pkgs.makeWrapper ]; 193 + nativeBuildInputs = [ pkgs.makeWrapper ]; 194 194 dontBuild = true; 195 195 dontUnpack = true; 196 196 installPhase = '' ··· 205 205 206 206 gitlab-rails = pkgs.stdenv.mkDerivation { 207 207 name = "gitlab-rails"; 208 - buildInputs = [ pkgs.makeWrapper ]; 208 + nativeBuildInputs = [ pkgs.makeWrapper ]; 209 209 dontBuild = true; 210 210 dontUnpack = true; 211 211 installPhase = ''
+1 -1
nixos/modules/services/networking/knot.nix
··· 18 18 19 19 knot-cli-wrappers = pkgs.stdenv.mkDerivation { 20 20 name = "knot-cli-wrappers"; 21 - buildInputs = [ pkgs.makeWrapper ]; 21 + nativeBuildInputs = [ pkgs.makeWrapper ]; 22 22 buildCommand = '' 23 23 mkdir -p $out/bin 24 24 makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \
+1 -1
nixos/modules/services/networking/pptpd.nix
··· 82 82 ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation { 83 83 name = "ppp-pptpd-wrapped"; 84 84 phases = [ "installPhase" ]; 85 - buildInputs = with pkgs; [ makeWrapper ]; 85 + nativeBuildInputs = with pkgs; [ makeWrapper ]; 86 86 installPhase = '' 87 87 mkdir -p $out/bin 88 88 makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \
+1 -1
nixos/modules/services/networking/tinc.nix
··· 410 410 environment.systemPackages = let 411 411 cli-wrappers = pkgs.stdenv.mkDerivation { 412 412 name = "tinc-cli-wrappers"; 413 - buildInputs = [ pkgs.makeWrapper ]; 413 + nativeBuildInputs = [ pkgs.makeWrapper ]; 414 414 buildCommand = '' 415 415 mkdir -p $out/bin 416 416 ${concatStringsSep "\n" (mapAttrsToList (network: data:
+1 -1
nixos/modules/services/networking/xl2tpd.nix
··· 84 84 xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation { 85 85 name = "xl2tpd-ppp-wrapped"; 86 86 phases = [ "installPhase" ]; 87 - buildInputs = with pkgs; [ makeWrapper ]; 87 + nativeBuildInputs = with pkgs; [ makeWrapper ]; 88 88 installPhase = '' 89 89 mkdir -p $out/bin 90 90
+1 -1
nixos/modules/services/web-apps/mediawiki.nix
··· 35 35 }; 36 36 37 37 mediawikiScripts = pkgs.runCommand "mediawiki-scripts" { 38 - buildInputs = [ pkgs.makeWrapper ]; 38 + nativeBuildInputs = [ pkgs.makeWrapper ]; 39 39 preferLocalBuild = true; 40 40 } '' 41 41 mkdir -p $out/bin
+1 -1
nixos/modules/virtualisation/azure-agent.nix
··· 17 17 18 18 patches = [ ./azure-agent-entropy.patch ]; 19 19 20 - buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; 20 + nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ]; 21 21 runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh 22 22 nettools # for hostname 23 23 procps # for pidof
+1 -1
nixos/tests/hydra/common.nix
··· 16 16 createTrivialProject = pkgs.stdenv.mkDerivation { 17 17 name = "create-trivial-project"; 18 18 dontUnpack = true; 19 - buildInputs = [ pkgs.makeWrapper ]; 19 + nativeBuildInputs = [ pkgs.makeWrapper ]; 20 20 installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; 21 21 postFixup = '' 22 22 wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
+1 -1
nixos/tests/kubernetes/base.nix
··· 18 18 ${master.ip} api.${domain} 19 19 ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} 20 20 ''; 21 - wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' 21 + wrapKubectl = with pkgs; runCommand "wrap-kubectl" { nativeBuildInputs = [ makeWrapper ]; } '' 22 22 mkdir -p $out/bin 23 23 makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" 24 24 '';