From 531e4b80c97002a542beb8fe356177ebd66cdd8e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 5 Sep 2017 17:26:13 -0400
Subject: misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook`
 `buildInputs`

Only acts on one-line dependency lists.
---
 pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix | 3 ++-
 pkgs/applications/editors/focuswriter/default.nix           | 3 ++-
 pkgs/applications/editors/gobby/default.nix                 | 3 ++-
 pkgs/applications/editors/leafpad/default.nix               | 3 ++-
 pkgs/applications/editors/supertux-editor/default.nix       | 3 ++-
 pkgs/applications/editors/vanubi/default.nix                | 3 ++-
 pkgs/applications/editors/zile/default.nix                  | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'pkgs/applications/editors')

diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index b4fb8d1937df..634c654d58fc 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
   };
 
-  buildInputs = [ emacs w3m texinfo autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ emacs w3m texinfo ];
 
   # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
   patchPhase = ''
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 28106cf876bd..0c8a8e787fb2 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
   };
 
-  buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ qt4 qmake4Hook hunspell ];
   
   qmakeFlags = [ "PREFIX=/" ];
 
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index 32998700c23e..de1e5e4c64bc 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation rec {
     sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
   };
 
-  buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
     ++ stdenv.lib.optional gnomeSupport gnome_vfs;
   
   configureFlags = ''
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index 055816a798d3..dd3fb542da7c 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
   };
 
-  buildInputs = [ intltool pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk2 ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a9f236a57ae7..a6d624d4b1ec 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
   };
 
-  buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
 
   installPhase = ''
     mkdir -p $out/bin $out/lib/supertux-editor
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 876bd145b725..273ef33250fc 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
   };
 
-  buildInputs = [ pkgconfig vala_0_26 which autoconf automake
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ vala_0_26 which autoconf automake
                   libtool glib gtk3 libwnck3 asciidoc
                   gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
 
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index fc2e8aa03de3..73bdb8bcbf3f 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
   };
 
-  buildInputs = [ pkgconfig ncurses boehmgc ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses boehmgc ];
   nativeBuildInputs = [ perl ]
     # `help2man' wants to run Zile, which won't work when the
     # newly-produced binary can't be run at build-time.
-- 
cgit 1.4.1