nix: use wiki overrideFlags snippet

Signed-off-by: Kenny Ballou <kb@devnulllabs.io>

1 files changed, 7 insertions, 11 deletions

diff --git a/nix/utils.nix b/nix/utils.nix
index 9848a785..1732554a 100644
--- a/nix/utils.nix
+++ b/nix/utils.nix
@@ -1,17 +1,13 @@
 { pkgs, ... }:
 # https://stackoverflow.com/questions/42136197/how-to-override-compile-flags-for-a-single-package-in-nixos
+# https://nixos.wiki/wiki/Snippets
 let
-  overrideWithFlags = pkg: flags:
-    pkgs.lib.overrideDerivation pkg (old:
-      let
-        newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
-        oldflags = if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old)
-                   then "${old.NIX_CFLAGS_COMPILE}"
-                   else "";
-      in
-        {
-          NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
-        });
+
+  overrideWithFlag = pkg: flag:
+    pkg.overrideAttrs (attrs: {
+      NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + "${flag}";
+    });
+  overrideWithFlags = pkg: flags: pkgs.lib.foldl' (pkg: flag: overrideWithFlag pkg flag) pkg flags;
 in
 {
   overrideWithFlags = overrideWithFlags;