Skip to content

Commit

Permalink
Fix clang build
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed Aug 24, 2020
1 parent d9a8619 commit b42789f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
20 changes: 19 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
description = "The purely functional package manager";

inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
inputs.lowdown-src = { url = "github:edolstra/lowdown/no-structs-in-anonymous-unions"; flake = false; };

outputs = { self, nixpkgs }:
outputs = { self, nixpkgs, lowdown-src }:

let

Expand Down Expand Up @@ -188,10 +189,14 @@
lowdown = with final; stdenv.mkDerivation {
name = "lowdown-0.7.1";

/*
src = fetchurl {
url = https://kristaps.bsd.lv/lowdown/snapshots/lowdown-0.7.1.tar.gz;
hash = "sha512-1daoAQfYD0LdhK6aFhrSQvadjc5GsSPBZw0fJDb+BEHYMBLjqiUl2A7H8N+l0W4YfGKqbsPYSrCy4vct+7U6FQ==";
};
*/

src = lowdown-src;

outputs = [ "out" "dev" ];

Expand Down
2 changes: 1 addition & 1 deletion src/nix/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ nix_SOURCES := \
$(wildcard src/nix-store/*.cc) \

# -fpermissive is needed by lowdown.
nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain -fpermissive
nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain

nix_LIBS = libexpr libmain libfetchers libstore libutil

Expand Down

0 comments on commit b42789f

Please sign in to comment.