diff --git a/flake.lock b/flake.lock index 28f524c..8a05118 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", "type": "github" }, "original": { diff --git a/meson.build b/meson.build index 7e55405..9119326 100644 --- a/meson.build +++ b/meson.build @@ -24,11 +24,6 @@ else error(compiler.get_id() + ' ' + compiler.version() + 'does not meet the compiler requirements') endif -if compiler.has_argument('-fexperimental-library') - add_global_arguments('-fexperimental-library', language: 'cpp') -else - error(compiler.get_id() + ' ' + compiler.version() + 'does not support -fexperimental-library') -endif ''' subdir('include') diff --git a/nix/matar-clang.nix b/nix/matar-clang.nix index 5151443..e305da7 100644 --- a/nix/matar-clang.nix +++ b/nix/matar-clang.nix @@ -19,7 +19,7 @@ packages.matar-clang = pkgs.callPackage ./build.nix { inherit src libraries stdenv; }; devShells.matar-clang = pkgs.callPackage ./shell.nix { inherit libraries stdenv; - tools = with pkgs; [ clang-tools_16 ]; + tools = with pkgs; [ (clang-tools_16.override { enableLibcxx = true; }) ]; }; }; }