treewide: Fix deps in a few other fixed output derivations

2018-01-09 19:27:23 -05:00 · 2018-01-09 19:27:23 -05:00 · 888404f11b
commit 888404f11b
parent 940c4fa3f5
28 changed files with 34 additions and 35 deletions
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@ -145,7 +145,7 @@ in rec {
        outputHashMode = "flat";
        outputHashAlgo = "md5";

-        buildInputs = [ curl ];
+        nativeBuildInputs = [ curl ];
        preferLocalBuild = true;

        buildCommand = ''
@ -178,7 +178,7 @@ in rec {

    getHash = path: import (runCommand "gethash.nix" {
      inherit path;
-      buildInputs = [ nix ];
+      nativeBuildInputs = [ nix ];
    } ''
      sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
      echo "\"$sha256\"" > "$out"
--- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
+++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  outputHashMode = "recursive";
  outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl";

-  buildInputs = [ curl ];
+  nativeBuildInputs = [ curl ];

  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 }
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  outputHashMode = "recursive";
  outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";

-  buildInputs = [ curl ];
+  nativeBuildInputs = [ curl ];

  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 }
--- a/pkgs/build-support/docker/pull.nix
+++ b/pkgs/build-support/docker/pull.nix
@ -14,7 +14,7 @@ let

      builder = ./pull.sh;

-      buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
+      nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];

      outputHashAlgo = "sha256";
      outputHash = sha256;
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@ -2,7 +2,7 @@
 { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
 stdenv.mkDerivation {
  name = "${name}-vendor";
-  buildInputs = [ cacert cargoVendor git rust.cargo ];
+  nativeBuildInputs = [ cacert cargoVendor git rust.cargo ];
  inherit src srcs sourceRoot;

  phases = "unpackPhase installPhase";
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
    sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
  };
  
-  buildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontdir mkfontscale ];

  installPhase =
    ''
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@ -32,7 +32,7 @@ stdenv.mkDerivation {
    inherit sha256;
  }) fonts;

-  buildInputs = [cabextract];
+  nativeBuildInputs = [cabextract];

  buildCommand = ''
    for i in $exes; do
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@ -25,7 +25,7 @@ let

  full-ttf = stdenv.mkDerivation {
    name = "dejavu-fonts-full-${version}";
-    buildInputs = [fontforge perl FontTTF];
+    nativeBuildInputs = [fontforge perl FontTTF];

    src = fetchFromGitHub {
      owner = "dejavu-fonts";
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
  };

-  buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];
+  nativeBuildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];

  dontBuild = true;
  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
  };

-  buildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontdir mkfontscale ];

  unpackPhase = ''
    tar -xzf $src --strip-components=1
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
  };

-  buildInputs = [ mkfontdir mkfontscale bdf2psf ];
+  nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ];

  unpackPhase = ''
    mkdir pcf bdf
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai";
  };

-  buildInputs = [ fontforge ];
+  nativeBuildInputs = [ fontforge ];

  installPhase = ''
    mkdir -p $out/share/fonts/truetype
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation {
    sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";
  };

-  buildInputs = [ dpkg ];
+  nativeBuildInputs = [ dpkg ];

  unpackCmd = ''
    dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  srcs = fonts;

-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
  sourceRoot = ".";

  installPhase = ''
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
  };

-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];

  sourceRoot = ".";

--- a/pkgs/data/fonts/nafees/default.nix
+++ b/pkgs/data/fonts/nafees/default.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  })
 ];

-  buildInputs = [unzip];
+  nativeBuildInputs = [unzip];

  sourceRoot = ".";

--- a/pkgs/data/fonts/poly/default.nix
+++ b/pkgs/data/fonts/poly/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    sha256 = "1chzcy3kyi7wpr4iq4aj1v24fq1wwph1v5z96dimlqcrnvm66h2l";
  };

-  buildInputs = [unzip];
+  nativeBuildInputs = [unzip];

  sourceRoot = ".";

--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
  };

-  buildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontdir mkfontscale ];

  installPhase =
    ''
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@ -4,14 +4,14 @@ let
  inherit (python2.pkgs) fonttools;

  common =
-    {version, url, sha256, buildInputs, postPatch ? null, outputHash}:
+    {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}:
    stdenv.mkDerivation rec {
      name = "liberation-fonts-${version}";
      src = fetchurl {
        inherit url sha256;
      };

-      inherit buildInputs postPatch;
+      inherit nativeBuildInputs postPatch;

      installPhase = ''
        mkdir -p $out/share/fonts/truetype
@ -53,21 +53,21 @@ in {
    version = "1.07.4";
    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
    sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
-    buildInputs = [ fontforge ];
+    nativeBuildInputs = [ fontforge ];
    outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
  };
  liberation_ttf_v1_binary = common rec {
    version = "1.07.4";
    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
    sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
-    buildInputs = [ ];
+    nativeBuildInputs = [ ];
    outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
  };
  liberation_ttf_v2_from_source = common rec {
    version = "2.00.1";
    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
    sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
-    buildInputs = [ fontforge fonttools ];
+    nativeBuildInputs = [ fontforge fonttools ];
    postPatch = ''
      substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
        'font = ttLib.TTFont(fontfile)' \
@ -79,7 +79,7 @@ in {
    version = "2.00.1";
    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
    sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
-    buildInputs = [ ];
+    nativeBuildInputs = [ ];
    outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
  };
 }
--- a/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/pkgs/data/fonts/tempora-lgc/default.nix
@ -18,12 +18,12 @@ let
      sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i";
    })
  ];
-  buildInputs = [
+  nativeBuildInputs = [
  ];
 in
 stdenv.mkDerivation {
  name = "tempora-lgc";
-  inherit buildInputs;
+  inherit nativeBuildInputs;
  inherit srcs;
  phases = "installPhase";
  installPhase = ''
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq";
  };

-  buildInputs = [ bdftopcf mkfontdir mkfontscale ];
+  nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ];
  buildPhase = ''
    for i in *.bdf; do
        bdftopcf -o ''${i/bdf/pcf} $i
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  sourceRoot = ".";

-  buildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontdir mkfontscale ];

  phases = [ "unpackPhase" "installPhase" ];

--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
    sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
  };

-  buildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontdir mkfontscale ];

  installPhase = ''
    mkdir -p $out/share/fonts
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0";
  };

-  buildInputs = [ mkfontscale mkfontdir ];
+  nativeBuildInputs = [ mkfontscale mkfontdir ];

  phases = "installPhase";

--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation rec {
    url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
    sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
  };
-  buildInputs = [];
  nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge 
    SDL SDL_image];
  preConfigure = ''
--- a/pkgs/games/factorio/fetch.nix
+++ b/pkgs/games/factorio/fetch.nix
@ -18,7 +18,7 @@
 }:

 stdenv.mkDerivation {
-  buildInputs = [ curl xidel ];
+  nativeBuildInputs = [ curl xidel ];

  inherit name url loginUrl username password cacert;

--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    # traffic, so don't do that.
    preferLocalBuild = true;

-    buildInputs = [ git gnupg ];
+    nativeBuildInputs = [ git gnupg ];
    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
  } ''
    git init src && (
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {

    configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];

-    buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
+    nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];

    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";