Skip to content

Commit

Permalink
add norwegian chars for folders
Browse files Browse the repository at this point in the history
Signed-off-by: Kristoffer Dalby <[email protected]>
  • Loading branch information
kradalby committed Jun 27, 2024
1 parent 8548294 commit 2e366bb
Show file tree
Hide file tree
Showing 48 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions flake.lock

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

27 changes: 16 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# warning: couldn't find pc file for spng
# and find that library in Nix and add it to the buildDeps.
]
++ lib.optionals pkgs.stdenv.isLinux [
++ lib.optionals stdenv.isLinux [
swift-corelibs-libdispatch
glibc.dev

Expand All @@ -84,12 +84,12 @@
];
in
{
overlay = final: prev: let
overlay = _: prev: let
pkgs = nixpkgs.legacyPackages.${prev.system};
in rec {
in {
munin = let
generated = pkgs.swiftpm2nix.helpers ./nix;
src = builtins.filterSource (path: type:
src = builtins.filterSource (path: _:
!(builtins.elem (baseNameOf path) [
"flake.nix"
"flake.lock"
Expand All @@ -99,12 +99,15 @@
]))
./.;
in
pkgs.swift.stdenv.mkDerivation rec {
pkgs.swift.stdenv.mkDerivation {
pname = "munin";
version = "0.0.0";
inherit version;

inherit src;
LD_LIBRARY_PATH = "${pkgs.swiftPackages.Dispatch}/lib";
LD_LIBRARY_PATH =
if pkgs.stdenv.isLinux
then "${pkgs.swiftPackages.Dispatch}/lib"
else null;

strictDeps = true;

Expand All @@ -118,7 +121,6 @@
# in the correct place, where SwiftPM expects them.
configurePhase = generated.configure;


# swiftpmFlags = ["--target x86_64-pc-linux-gnu"];

installPhase = ''
Expand All @@ -138,10 +140,13 @@
overlays = [self.overlay];
inherit system;
};
in rec {
in {
# `nix develop`
devShell = pkgs.mkShell.override { stdenv = pkgs.swift.stdenv; } {
LD_LIBRARY_PATH = "${pkgs.swiftPackages.Dispatch}/lib";
devShell = pkgs.mkShell.override {inherit (pkgs.swift) stdenv;} {
LD_LIBRARY_PATH =
if pkgs.stdenv.isLinux
then "${pkgs.swiftPackages.Dispatch}/lib"
else null;
nativeBuildInputs = ndeps pkgs;
buildInputs =
(bdeps pkgs)
Expand Down

0 comments on commit 2e366bb

Please sign in to comment.