diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7c6482e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +outputs/ +result +result-* +repl-result-* diff --git a/flake.nix b/flake.nix index 94ea2e8..a715717 100644 --- a/flake.nix +++ b/flake.nix @@ -5,13 +5,10 @@ outputs = { self, nixpkgs }: let system = "x86_64-linux"; - myOverlay = import ./overlays/my-pkgs.nix; - pkgs = import nixpkgs { - inherit system; - overlays = [ myOverlay ]; - }; + pkgs = import nixpkgs { inherit system; }; in { - overlays = [ myOverlay ]; - packages.${system} = pkgs; + packages.${system} = { + fonts-ms-win11 = pkgs.callPackage ./pkgs/fonts-ms-win11 {}; + }; }; } diff --git a/overlays/my-pkgs.nix b/overlays/my-pkgs.nix deleted file mode 100644 index e4a39d6..0000000 --- a/overlays/my-pkgs.nix +++ /dev/null @@ -1,9 +0,0 @@ -self: super: let - pkgsDir = builtins.toString ./../pkgs; - pkgNames = builtins.attrNames (builtins.readDir pkgsDir); - myPkgs = builtins.listToAttrs (map (name: { - name = name; value = super.callPackage (pkgsDir + "/" + name) {}; - }) pkgNames); - -in - super // myPkgs diff --git a/pkgs/fonts-ms-win11/default.nix b/pkgs/fonts-ms-win11/default.nix index 9921605..df445b0 100644 --- a/pkgs/fonts-ms-win11/default.nix +++ b/pkgs/fonts-ms-win11/default.nix @@ -18,8 +18,12 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/fonts/truetype - install -D *.{ttf,TTF} $out/share/fonts/truetype/ + install -D *.{ttf,TTF} $out/share/fonts/truetype/ install -D *.ttc $out/share/fonts/ + + mkdir -p $out/share/doc/$pname/ + install -D {license,LICENSE}.* $out/share/doc/$pname/ + runHook postInstall '';