mirror of https://github.com/materusPL/Nixerus.git
Compare commits
No commits in common. "2caaf0b89ebf8edb9a1b0400c774670d838ef12f" and "c381bde8eab3998246dd7c31eb0047526a319224" have entirely different histories.
2caaf0b89e
...
c381bde8ea
|
|
@ -35,13 +35,13 @@ jobs:
|
|||
nixPath:
|
||||
- nixpkgs=channel:nixos-unstable
|
||||
- nixpkgs=channel:nixpkgs-unstable
|
||||
- nixpkgs=channel:nixos-24.11
|
||||
- nixpkgs=channel:nixos-24.05
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
uses: cachix/install-nix-action@v30
|
||||
with:
|
||||
nix_path: "${{ matrix.nixPath }}"
|
||||
extra_nix_config: |
|
||||
|
|
@ -50,7 +50,7 @@ jobs:
|
|||
- name: Show nixpkgs version
|
||||
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
|
||||
- name: Setup cachix
|
||||
uses: cachix/cachix-action@v16
|
||||
uses: cachix/cachix-action@v15
|
||||
# Don't replace <YOUR_CACHIX_NAME> here!
|
||||
if: ${{ matrix.cachixName != '<YOUR_CACHIX_NAME>' }}
|
||||
with:
|
||||
|
|
|
|||
83
flake.lock
83
flake.lock
|
|
@ -1,26 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -28,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744208565,
|
||||
"narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
|
||||
"lastModified": 1729459288,
|
||||
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
|
||||
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -44,11 +23,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1744098102,
|
||||
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -58,33 +37,12 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1741173522,
|
||||
"narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741294988,
|
||||
"narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=",
|
||||
"path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source",
|
||||
"rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e",
|
||||
"lastModified": 1729516261,
|
||||
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
|
||||
"path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source",
|
||||
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -98,27 +56,6 @@
|
|||
"nixpkgs": "nixpkgs",
|
||||
"nur": "nur"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, jdk
|
||||
, jdk21
|
||||
, ghc_filesystem
|
||||
, zlib
|
||||
, file
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
, quazip
|
||||
, libGL
|
||||
, flite
|
||||
, addDriverRunpath
|
||||
, addOpenGLRunpath
|
||||
, vulkan-loader
|
||||
, msaClientID ? null
|
||||
, extra-cmake-modules
|
||||
|
|
@ -56,19 +56,19 @@ let
|
|||
stdenv.cc.cc.lib
|
||||
]);
|
||||
|
||||
gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib";
|
||||
gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib";
|
||||
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5");
|
||||
version = "7.0";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PolyMC";
|
||||
repo = "PolyMC";
|
||||
rev = version;
|
||||
sha256 = "sha256-tJA/xSfqRXZK/OXbxhLNqUJU5nQGVzxgownXUMTy284=";
|
||||
sha256 = "sha256-AOy13zAWQ0CtsX9z1M+fxH7Sh/QSFy7EdQ/fD9yUYc8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
dontWrapQtApps = true;
|
||||
|
|
@ -76,7 +76,7 @@ let
|
|||
cmake
|
||||
extra-cmake-modules
|
||||
ninja
|
||||
jdk
|
||||
jdk21
|
||||
wrapQtAppsHook
|
||||
file
|
||||
ghc_filesystem
|
||||
|
|
@ -101,7 +101,7 @@ let
|
|||
postPatch = ''
|
||||
# hardcode jdk paths
|
||||
substituteInPlace launcher/java/JavaUtils.cpp \
|
||||
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")'
|
||||
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk21}/lib/openjdk/bin/java")'
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/bin/env python
|
||||
from urllib.request import urlopen
|
||||
import subprocess
|
||||
import codecs
|
||||
|
|
@ -6,6 +6,11 @@ import sys
|
|||
|
||||
amd_repo = "https://repo.radeon.com/amdgpu/"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def readPackages(packageString, packages,version):
|
||||
for line in packageString.splitlines():
|
||||
x = line.split(":",1)
|
||||
|
|
@ -17,7 +22,7 @@ def readPackages(packageString, packages,version):
|
|||
elif x[0] == "SHA256":
|
||||
packages[len(packages) - 1]["sha256"] = x[1].strip()
|
||||
|
||||
def generateFetchurl(version = "6.3.4", ubuntu_code = "jammy"):
|
||||
def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
|
||||
|
||||
packages = []
|
||||
packages32 = []
|
||||
|
|
@ -36,6 +41,8 @@ def generateFetchurl(version = "6.3.4", 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}";
|
||||
|
|
@ -47,6 +54,8 @@ def generateFetchurl(version = "6.3.4", 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}";
|
||||
|
|
@ -69,3 +78,5 @@ elif len(sys.argv) == 2:
|
|||
generateFetchurl(sys.argv[1],sys.argv[2])
|
||||
else:
|
||||
print("Too much args: arg1 = version, arg2 = ubuntu codename")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue