From 6d0463d37d046829264a65b7f40996cc76e99974 Mon Sep 17 00:00:00 2001 From: Jake Hamilton Date: Thu, 22 Aug 2024 16:25:33 -0700 Subject: [PATCH] fix: working gcc build --- tidepool/flake.lock | 18 ++++++++++-------- .../src/packages/foundation/gcc/default.nix | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tidepool/flake.lock b/tidepool/flake.lock index 9318c85..746a587 100644 --- a/tidepool/flake.lock +++ b/tidepool/flake.lock @@ -8,10 +8,11 @@ }, "locked": { "dir": "foundation", - "dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty", - "dirtyShortRev": "cadfaab-dirty", - "lastModified": 1723737980, - "narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=", + "lastModified": 1724190751, + "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=", + "ref": "master", + "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f", + "revCount": 84, "type": "git", "url": "file:../" }, @@ -24,10 +25,11 @@ "lib": { "locked": { "dir": "lib", - "dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty", - "dirtyShortRev": "cadfaab-dirty", - "lastModified": 1723737980, - "narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=", + "lastModified": 1724190751, + "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=", + "ref": "master", + "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f", + "revCount": 84, "type": "git", "url": "file:../" }, diff --git a/tidepool/src/packages/foundation/gcc/default.nix b/tidepool/src/packages/foundation/gcc/default.nix index 9062075..3887773 100644 --- a/tidepool/src/packages/foundation/gcc/default.nix +++ b/tidepool/src/packages/foundation/gcc/default.nix @@ -203,7 +203,7 @@ in patch = '' # Patch # force musl even if host triple is gnu - # sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host + sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host ''; configure = ''