diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 17:26:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
| commit | 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch) | |
| tree | 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/applications/misc/st | |
| parent | fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff) | |
| download | nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip | |
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
Only acts on one-line dependency lists.
Diffstat (limited to 'pkgs/applications/misc/st')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/st/wayland.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/st/xst.nix | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 16d6ca2e26fa..f44ed8a1a3ef 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index ab890c8db718..69794b1cffbd 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ]; NIX_LDFLAGS = "-lfontconfig"; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 05e34cc5c305..877990861fd7 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; }; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out |