From a5dd57dd48d610c11f08c7fd99b3fbd2e8151ff8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 6 Sep 2018 21:25:58 +0200 Subject: pkgs.writeC: drop support for nixpkgs<18.03 --- pkgs/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 9238d32..df32f59 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -125,12 +125,11 @@ pkgs: oldpkgs: { inherit text; passAsFile = [ "text" ]; } /* sh */ '' - PATH=${makeBinPath (with pkgs; [ - # TODO remove if everyone migrated to 18.03 - (if hasAttr "binutils-unwrapped" pkgs then binutils-unwrapped else binutils) - coreutils - gcc - ])} + PATH=${makeBinPath [ + pkgs.binutils-unwrapped + pkgs.coreutils + pkgs.gcc + ]} exe=$out${destination} mkdir -p "$(dirname "$exe")" gcc -O -Wall -o "$exe" -x c "$textPath" -- cgit v1.2.3