Skip to content

Commit 91b7a11

Browse files
committed
fix(mcl/default.nix): Remove dmd compiler flags from build and test configurations
1 parent 79759c4 commit 91b7a11

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

packages/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
// optionalAttrs (system == "x86_64-linux") {
7070
mcl = pkgs.callPackage ./mcl {
7171
buildDubPackage = inputs'.dlang-nix.legacyPackages.buildDubPackage.override {
72-
dCompiler = inputs'.dlang-nix.packages."ldc-binary-1_34_0";
72+
dCompiler = inputs'.dlang-nix.packages."ldc-binary-1_38_0";
7373
};
7474
inherit (legacyPackages.inputs.nixpkgs) cachix nix nix-eval-jobs;
7575
};

packages/mcl/default.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ let
2323
xorg.xrandr
2424
glxinfo
2525
cachix
26+
curl
2627
]);
2728
excludedTests = (
2829
lib.concatStringsSep "|" [
@@ -52,17 +53,15 @@ buildDubPackage rec {
5253
nativeBuildInputs = [ pkgs.makeWrapper ] ++ deps;
5354

5455
postFixup = ''
55-
wrapProgram $out/bin/${pname} --set PATH "${lib.makeBinPath deps}"
56+
wrapProgram $out/bin/${pname} --set PATH "${lib.makeBinPath deps}" --set LD_LIBRARY_PATH "${lib.makeLibraryPath deps}"
5657
'';
5758

5859
dubBuildFlags = [
59-
"--compiler=dmd"
6060
"-b"
6161
"debug"
6262
];
6363

6464
dubTestFlags = [
65-
"--compiler=dmd"
6665
"--"
6766
"-e"
6867
excludedTests

0 commit comments

Comments
 (0)