mirror of
https://github.com/materusPL/Nixerus.git
synced 2026-07-09 16:41:58 +00:00
Update to 24.11
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, jdk21
|
||||
, jdk
|
||||
, ghc_filesystem
|
||||
, zlib
|
||||
, file
|
||||
@@ -21,7 +21,7 @@
|
||||
, quazip
|
||||
, libGL
|
||||
, flite
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, vulkan-loader
|
||||
, msaClientID ? null
|
||||
, extra-cmake-modules
|
||||
@@ -56,7 +56,7 @@ let
|
||||
stdenv.cc.cc.lib
|
||||
]);
|
||||
|
||||
gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib";
|
||||
gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib";
|
||||
|
||||
|
||||
in
|
||||
@@ -76,7 +76,7 @@ let
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
ninja
|
||||
jdk21
|
||||
jdk
|
||||
wrapQtAppsHook
|
||||
file
|
||||
ghc_filesystem
|
||||
|
||||
+1084
-1065
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
#!/bin/env python
|
||||
#!/usr/bin/env python
|
||||
from urllib.request import urlopen
|
||||
import subprocess
|
||||
import codecs
|
||||
@@ -6,11 +6,6 @@ import sys
|
||||
|
||||
amd_repo = "https://repo.radeon.com/amdgpu/"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def readPackages(packageString, packages,version):
|
||||
for line in packageString.splitlines():
|
||||
x = line.split(":",1)
|
||||
@@ -22,7 +17,7 @@ def readPackages(packageString, packages,version):
|
||||
elif x[0] == "SHA256":
|
||||
packages[len(packages) - 1]["sha256"] = x[1].strip()
|
||||
|
||||
def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
|
||||
def generateFetchurl(version = "6.3.4", ubuntu_code = "jammy"):
|
||||
|
||||
packages = []
|
||||
packages32 = []
|
||||
@@ -41,8 +36,6 @@ def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
|
||||
_all = "["
|
||||
final = "{ fetchurl }:\n{\nversion=\""+version+"\";\nbit64 = rec { "
|
||||
for p in packages:
|
||||
#x = subprocess.run(["nix-prefetch-url" ,"--type" , "sha256", p["url"]],capture_output=True)
|
||||
#sha_hash = codecs.decode(x.stdout, "UTF-8").strip()
|
||||
_all += " " + p["name"].replace(".","_") + " "
|
||||
final += """\n{name} = ( fetchurl {{
|
||||
url = "{url}";
|
||||
@@ -54,8 +47,6 @@ def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
|
||||
final+= "\nall = "+ _all+"\n};\nbit32 = rec { "
|
||||
_all = "["
|
||||
for p in packages32:
|
||||
#x = subprocess.run(["nix-prefetch-url" ,"--type" , "sha256", p["url"]],capture_output=True)
|
||||
#sha_hash = codecs.decode(x.stdout, "UTF-8").strip()
|
||||
_all += " " + p["name"].replace(".","_") + " "
|
||||
final += """\n{name} = ( fetchurl {{
|
||||
url = "{url}";
|
||||
@@ -78,5 +69,3 @@ elif len(sys.argv) == 2:
|
||||
generateFetchurl(sys.argv[1],sys.argv[2])
|
||||
else:
|
||||
print("Too much args: arg1 = version, arg2 = ubuntu codename")
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user