From bb30494380a9fb306459b75137ddb0973c56c4db Mon Sep 17 00:00:00 2001 From: patrick-scho Date: Thu, 3 Jul 2025 11:11:26 +0200 Subject: [PATCH] add overlay directly to outputs --- flake.nix | 84 +++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.nix b/flake.nix index 40898d3..5f7f678 100644 --- a/flake.nix +++ b/flake.nix @@ -4,49 +4,49 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { inherit system; }; - in { - overlays = { - cgit = final: prev: { - cgit = prev.cgit.overrideAttrs (oldAttrs: { - postPatch = ''substituteInPlace ui-repolist.c --replace "master" "main"''; - }); - }; + outputs = { self, nixpkgs, flake-utils }: { + overlays = { + cgit = final: prev: { + cgit = prev.cgit.overrideAttrs (oldAttrs: { + postPatch = ''substituteInPlace ui-repolist.c --replace "master" "main"''; + }); + }; + }; + } ++ + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + in { + packages.resetmsmice = pkgs.stdenv.mkDerivation { + pname = "resetmsmice"; + version = "0.0.0"; + src = pkgs.fetchFromGitHub { + owner = "paulrichards321"; + repo = "resetmsmice"; + rev = "2623a46bcfdaab199b1fc080060d4e3f1c94ce86"; + hash = "sha256-xRteJe7lAoyMrz13UIXCkg5dxhziT6e9Bn7+zYzt2j8="; }; - packages.resetmsmice = pkgs.stdenv.mkDerivation { - pname = "resetmsmice"; - version = "0.0.0"; - src = pkgs.fetchFromGitHub { - owner = "paulrichards321"; - repo = "resetmsmice"; - rev = "2623a46bcfdaab199b1fc080060d4e3f1c94ce86"; - hash = "sha256-xRteJe7lAoyMrz13UIXCkg5dxhziT6e9Bn7+zYzt2j8="; - }; - - buildInputs = with pkgs; [ - autoconf automake pkg-config libusb1 shadow - ]; - - buildPhase = '' - autoreconf -i . - ./configure --disable-gui --prefix=$out - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp resetmsmice $out/bin/ - ''; - }; - - apps.resetmsmice = { - type = "app"; - program = "${self.packages.${system}.resetmsmice}/bin/resetmsmice"; - }; - }); + buildInputs = with pkgs; [ + autoconf automake pkg-config libusb1 shadow + ]; + + buildPhase = '' + autoreconf -i . + ./configure --disable-gui --prefix=$out + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp resetmsmice $out/bin/ + ''; + }; + + apps.resetmsmice = { + type = "app"; + program = "${self.packages.${system}.resetmsmice}/bin/resetmsmice"; + }; + }); } -- 2.50.1