Sigh, here we go #9

Open
patrick wants to merge 15 commits from woodpekcer into main
2 changed files with 34 additions and 2 deletions
Showing only changes of commit e8fa607279 - Show all commits

21
flake.lock generated
View File

@@ -18,6 +18,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-ld": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1701153607,
"narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-ld",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701253981, "lastModified": 1701253981,
@@ -37,6 +57,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-ld": "nix-ld",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },

View File

@@ -3,12 +3,17 @@
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nix-ld = {
url = "github:Mic92/nix-ld";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
nix-ld,
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: let system: let
@@ -25,9 +30,16 @@
pkgs.darwin.apple_sdk.frameworks.GSS pkgs.darwin.apple_sdk.frameworks.GSS
] ]
else []; else [];
in let
deps = darwinDeps ++ [pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu];
in { in {
devShells = { devShells = {
default = pkgs.mkShell { default = pkgs.mkShell {
NIX_LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath ([
pkgs.stdenv.cc.cc
]
++ deps);
NIX_LD = "${pkgs.stdenv.cc.libc_bin}/bin/ld.so";
buildInputs = with pkgs; buildInputs = with pkgs;
[ [
(with dotnetCorePackages; (with dotnetCorePackages;
@@ -36,8 +48,7 @@
dotnetPackages.Nuget dotnetPackages.Nuget
]) ])
] ]
++ darwinDeps ++ [pkgs.alejandra];
++ [pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu pkgs.alejandra];
}; };
}; };
} }