From f0e6a9f19563ea4ed0db7d47a00d9a447cfb0ea8 Mon Sep 17 00:00:00 2001
From: heyarne <arne@schlueter.is>
Date: Fri, 11 Feb 2022 21:53:48 +0100
Subject: [PATCH] Reorganize nix files

---
 default.nix |  8 +++++++-
 flake.nix   | 13 ++-----------
 shell.nix   |  4 ++++
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 shell.nix

diff --git a/default.nix b/default.nix
index 854458b..7ca0f7f 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, stdenv, glibc }:
 
 buildGoModule rec {
   pname = "inkpot-cli";
@@ -7,6 +7,12 @@ buildGoModule rec {
   src = ./.;
   vendorSha256 = "sha256-W+oAjjRYXoKM20nubO0y2yUA4WRjOn7zki3pIf9TMvc=";
 
+  buildInputs = [
+    stdenv
+    glibc.static
+  ];
+  ldflags = "-linkmode external -extldflags -static";
+
   meta = with lib; {
     description = "Command-line tool to customize Spotify client";
     homepage = "https://github.com/khanhas/spicetify-cli/";
diff --git a/flake.nix b/flake.nix
index b1fd090..89e475a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,16 +8,7 @@
     pkgs = nixpkgs.legacyPackages.${system};
     lib = pkgs.lib;
   in {
-    devShell.${system} = pkgs.mkShell rec {
-      buildInputs = with pkgs; [
-        go
-        gopls
-        stdenv
-        glibc.static
-      ];
-
-      CFLAGS="-I${pkgs.glibc.dev}/include";
-      LDFLAGS="-L${pkgs.glibc}/lib";
-    };
+    defaultPackage.${system} = pkgs.callPackage ./default.nix {};
+    devShell.${system} = pkgs.callPackage ./shell.nix {};
   };
 }
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..13ecb54
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,4 @@
+{ mkShell, go, gopls }:
+mkShell rec {
+  buildInputs = [ go gopls ];
+}