nix: fix overlay
This commit is contained in:
		@@ -26,9 +26,9 @@
 | 
			
		||||
          };
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        overlay = import ./packages/nix/overlay.nix {
 | 
			
		||||
          inherit self quazip libnbtplusplus;
 | 
			
		||||
        };
 | 
			
		||||
        overlay = (final: prev: rec { 
 | 
			
		||||
          polymc = packages.polymc;
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        apps = {
 | 
			
		||||
          polymc = flake-utils.lib.mkApp {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
{ self, quazip, libnbtplusplus }:
 | 
			
		||||
 | 
			
		||||
final: prev: rec {
 | 
			
		||||
  polymc = prev.libsForQt5.callPackage ./polymc {
 | 
			
		||||
    inherit self;
 | 
			
		||||
    submoduleQuazip = quazip;
 | 
			
		||||
    submoduleNbt = libnbtplusplus;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
@@ -42,6 +42,7 @@ mkDerivation rec {
 | 
			
		||||
  buildInputs = [ qtbase jdk8 zlib ];
 | 
			
		||||
 | 
			
		||||
  postUnpack = ''
 | 
			
		||||
    rm -rf source/libraries/{libnbtplusplus,quazip}
 | 
			
		||||
    mkdir source/libraries/{libnbtplusplus,quazip}
 | 
			
		||||
    cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus
 | 
			
		||||
    cp -a ${submoduleQuazip}/* source/libraries/quazip
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user