From f71953b304ccf31695676f73facacea991ad47f6 Mon Sep 17 00:00:00 2001 From: Patrick Stevens Date: Wed, 28 Dec 2022 12:20:13 +0000 Subject: [PATCH] Tidy nix things into a separate folder (#50) --- flake.nix | 4 ++-- install.sh | 18 ------------------ deps.nix => nix/deps.nix | 0 fetchDeps.sh => nix/fetchDeps.sh | 0 4 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 install.sh rename deps.nix => nix/deps.nix (100%) rename fetchDeps.sh => nix/fetchDeps.sh (100%) diff --git a/flake.nix b/flake.nix index d029332..b35ab8d 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ runtimeIds = map (system: pkgs.dotnetCorePackages.systemToDotnetRid system) dotnet-sdk.meta.platforms; in pkgs.writeShellScript "fetch-${pname}-deps" (builtins.readFile (pkgs.substituteAll { - src = ./fetchDeps.sh; + src = ./nix/fetchDeps.sh; pname = pname; binPath = pkgs.lib.makeBinPath [pkgs.coreutils dotnet-sdk (pkgs.nuget-to-nix.override {inherit dotnet-sdk;})]; projectFiles = toString (pkgs.lib.toList projectFile); @@ -67,7 +67,7 @@ version = version; src = ./.; projectFile = projectFile; - nugetDeps = ./deps.nix; + nugetDeps = ./nix/deps.nix; doCheck = true; dotnet-sdk = dotnet-sdk; dotnet-runtime = dotnet-runtime; diff --git a/install.sh b/install.sh deleted file mode 100644 index bcaf27f..0000000 --- a/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -runHook preInstall -target="${out:?}/lib/dotnet/@pname@" -mkdir -p "$target" -cp -rv @outputFiles@ AdventOfCode2022.App/bin/Release/net7.0/publish/* "$target" -pushd "$out" || exit 1 -remove-duplicated-dlls.sh -popd || exit 2 -set -f -exe="$target/AdventOfCode2022.App" -[ -f "$exe" ] || exit 3 -mkdir -p "$out"/bin -commandName="$(basename -s .exe "$(echo "$exe" | tr "[:upper:]" "[:lower:]")")" -makeWrapper \ - "$exe" \ - "$out/bin/$commandName" - -runHook postInstall diff --git a/deps.nix b/nix/deps.nix similarity index 100% rename from deps.nix rename to nix/deps.nix diff --git a/fetchDeps.sh b/nix/fetchDeps.sh similarity index 100% rename from fetchDeps.sh rename to nix/fetchDeps.sh