From 2c07f758a0c1e4d6ee7a9e6df1faf6b9aa3824a1 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 13 Mar 2022 18:18:46 +0200
Subject: nix: refactor flake (drop flake-utils)

---
 packages/nix/polymc/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix
index 63fc6b7e..bea62b26 100644
--- a/packages/nix/polymc/default.nix
+++ b/packages/nix/polymc/default.nix
@@ -14,10 +14,11 @@
 , libGL
 , msaClientID ? ""
 
-# flake
+  # flake
 , self
-, submoduleNbt
-, submoduleQuazip
+, version
+, libnbtplusplus
+, quazip
 }:
 
 let
@@ -30,7 +31,7 @@ let
     libXxf86vm
     libpulseaudio
     libGL
-  ]; 
+  ];
 
   # This variable will be passed to Minecraft by PolyMC
   gameLibraryPath = libpath + ":/run/opengl-driver/lib";
@@ -38,7 +39,7 @@ in
 
 mkDerivation rec {
   pname = "polymc";
-  version = "nightly";
+  inherit version;
 
   src = lib.cleanSource self;
 
@@ -57,8 +58,8 @@ mkDerivation rec {
     # Copy submodules inputs
     rm -rf source/libraries/{libnbtplusplus,quazip}
     mkdir source/libraries/{libnbtplusplus,quazip}
-    cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus
-    cp -a ${submoduleQuazip}/* source/libraries/quazip
+    cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
+    cp -a ${quazip}/* source/libraries/quazip
     chmod a+r+w source/libraries/{libnbtplusplus,quazip}/*
   '';
 
-- 
cgit