Add pistol-static and more

Use the same nixpkgs input for gomod2nix.
doronbehar · Mar 18, 2021 · 2e645a0 · 2e645a0
1 parent 080369b
commit 2e645a0
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 50 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,17 +2,20 @@
   description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant";
 
   # To make user overrides of the nixpkgs flake not take effect
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-
-  # https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
-  inputs.flake-compat = {
-    url = "github:edolstra/flake-compat";
-    flake = false;
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    # https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+    gomod2nix-flake = {
+      url = "github:tweag/gomod2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  inputs.gomod2nix-flake.url = "github:tweag/gomod2nix";
-
   outputs = { self
     , nixpkgs
     , flake-utils
@@ -28,36 +31,55 @@
         inherit system;
         config = {};
       };
+      nativeBuildInputs = [
+        pkgs.gomod2nix
+      ];
+      checkInputs = [
+        pkgs.elinks
+        pkgs.bat
+        # For tput
+        pkgs.ncurses
+      ];
+      buildInputs = [
+        pkgs.file
+      ];
       pistol = pkgs.buildGoApplication rec {
         pname = "pistol";
         version = "${pkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./VERSION)}-flake";
         src = builtins.filterSource
           (path: type: type != "directory" || baseNameOf path != ".git")
           ./.;
         modules = ./gomod2nix.toml;
-        inherit (pkgs.pistol)
-          meta
-          passthru
-          subPackages
-          buildInputs
-        ;
+        inherit (pkgs.pistol) meta;
+        subPackages = [ "cmd/pistol" ];
+        # We don't do a check in every build (yet) so we don't need to inherit
+        # checkInputs as of yet.
+        inherit buildInputs;
+        CGO_ENABLED = "1";
         buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
       };
-    in rec {
-      devShell = pkgs.mkShell {
-        buildInputs = [
-          pkgs.file
-          pkgs.elinks
-          pkgs.gomod2nix
+      pistol-static = pistol.overrideAttrs(oldAttrs: {
+        pname = "pistol-static";
+        buildInputs = buildInputs ++ [
+          pkgs.glibc.static
+          pkgs.pkgsStatic.file
         ];
+        CFLAGS = "-I${pkgs.glibc.dev}/include";
+        LDFLAGS = "-I${pkgs.glibc}/lib";
+      });
+    in {
+      devShell = pkgs.mkShell {
+        inherit buildInputs nativeBuildInputs checkInputs;
+      };
+      packages = {
+        inherit pistol pistol-static;
       };
-      packages.pistol = pistol;
       defaultPackage = pistol;
       apps.pistol = {
         type = "app";
         program = "${pistol}/bin/pistol";
       };
-      defaultApp = apps.pistol;
+      defaultApp = self.apps.pistol;
     }
   );
 }