diff options
| author | tv <tv@krebsco.de> | 2018-09-06 21:25:58 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-06 21:25:58 +0200 |
| commit | a5dd57dd48d610c11f08c7fd99b3fbd2e8151ff8 (patch) | |
| tree | 3e72db6cd8f46e642750896aaf618fd010b6f2d9 | |
| parent | b8e4324642924e09235a02c050e49b624ac3f0a2 (diff) | |
pkgs.writeC: drop support for nixpkgs<18.03
| -rw-r--r-- | pkgs/default.nix | 11 |
1 files 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" |