diff --git a/flake.lock b/flake.lock index a94608569e..3c119f055a 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "advisory-db_2": { "flake": false, "locked": { - "lastModified": 1697318478, - "narHash": "sha256-ZEDgHfurZiv9lBGTmHnQ0YECoi6H2NYs3pTo1VU1koQ=", + "lastModified": 1698509797, + "narHash": "sha256-7U+RPs2Zue8Ci/tD6aftLGlf4mUHJ9bmbB+c4mfwH9s=", "owner": "rustsec", "repo": "advisory-db", - "rev": "71d80e811f2e29a4b82d3e545ad6591e35227e03", + "rev": "0c251c3c9a1b08e08ef5946d4c2d133fe1bc213e", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1697840921, - "narHash": "sha256-zXHwu104SQOxogkMgg+w22c3+zI/FvK83TAkfLmeKw0=", + "lastModified": 1698166613, + "narHash": "sha256-y4rdN4flxRiROqNi1waMYIZj/Fs7L2OrszFk/1ry9vU=", "owner": "ipetkov", "repo": "crane", - "rev": "758ae442227103fa501276e8225609a11c99718e", + "rev": "b7db46f0f1751f7b1d1911f6be7daf568ad5bc65", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697915759, - "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", + "lastModified": 1699186365, + "narHash": "sha256-Pxrw5U8mBsL3NlrJ6q1KK1crzvSUcdfwb9083sKDrcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", + "rev": "a0b3b06b7a82c965ae0bb1d59f6e386fe755001d", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1697854201, - "narHash": "sha256-H+0Wb20PQx/8N7X/OfwwAVPeN9TbfjcyG0sXbdgsh50=", + "lastModified": 1698726852, + "narHash": "sha256-V1S4TTzg++GzPc96i/yy4jib+7/xU0LXHcggm9MllMM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6e8e3332433847cd56186b1f6fc8c47603cf5b46", + "rev": "ec19bd20af08f3b004089cc12ab54c823ed899b7", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1698046070, - "narHash": "sha256-zs1TB+Fj+fKwqxXpz1CjeA8tQ9AKsp0Co4maiFwGEQg=", + "lastModified": 1698754835, + "narHash": "sha256-BEJmOlgcNbZBamp0BwzJetKWWCzEG7ZIAB10axehidk=", "owner": "onekey-sec", "repo": "unblob-native", - "rev": "ad931a3016122e862817ad7f30968024c649e3b3", + "rev": "89e52c865b06aab72e92a8b2cac85352da89cfd0", "type": "github" }, "original": { diff --git a/overlay.nix b/overlay.nix index 465ed18981..94706fe19c 100644 --- a/overlay.nix +++ b/overlay.nix @@ -31,11 +31,11 @@ inputs: final: prev: tomli ]; - CXXFLAGS = lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-fvisibility-inlines-hidden" "-static-libstdc++" "-static-libgcc" ] - ++ lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]; + env.CXXFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-fvisibility-inlines-hidden" "-static-libstdc++" "-static-libgcc" ] + ++ lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); - CFLAGS = lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-static-libstdc++" "-static-libgcc" ]; - LDFLAGS = lib.optional stdenv.isLinux [ "-Wl,--gc-sections" "-Wl,--exclude-libs,ALL" ]; + env.CFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-static-libstdc++" "-static-libgcc" ]); + env.LDFLAGS = toString (lib.optional stdenv.isLinux [ "-Wl,--gc-sections" "-Wl,--exclude-libs,ALL" ]); dontUseCmakeConfigure = true;