add freecad

This commit is contained in:
2024-10-13 14:03:13 -04:00
parent 7f06577962
commit 5b71bca1fe
4 changed files with 25 additions and 18 deletions

6
etcnixos/flake.lock generated
View File

@@ -316,11 +316,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728269138, "lastModified": 1728729581,
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728685293, "lastModified": 1728791962,
"narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=", "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47", "rev": "64c6325b28ebd708653dd41d88f306023f296184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -98,11 +98,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1728579099, "lastModified": 1728829629,
"narHash": "sha256-cE2rv4xHe9l1xczfJmUnV7pKuDzFM8DtLDYndppiahg=", "narHash": "sha256-y3fWim/0mDCSLjvqkmylN5mmVOfvwJG9Mt+Z8qIn44U=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "3f80dcf1833101dc377b1c4e1659da4b8e86f3eb", "rev": "0a50b261ac5b6cdcc8eb7921a4f022c92b29d1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -131,11 +131,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728546258, "lastModified": 1728822376,
"narHash": "sha256-iE6O7EBokq/HjjwouHfd7EGmED7TUkB9icSbUfPHWSo=", "narHash": "sha256-HQc10OfFNie5YocsrJQCN6BOi+CZ0uuGGHGbJFXjgUI=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "859c0be0e5fa5ccf3c59f0ae1764551a930656fd", "rev": "d7156df8428cb9e6665a212e66c74bdb25842be8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -174,11 +174,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1728500571, "lastModified": 1728740863,
"narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728613723, "lastModified": 1728786660,
"narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", "narHash": "sha256-qY+1e0o6oV5ySlErhj/dsWsPLWjrMKzq4QI7a1t9/Ps=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", "rev": "174a8d9cec9e2c23877a7b887c52b68ef0421d8b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -93,6 +93,8 @@
inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser
(factorio.override (import ./secrets/factorio.nix)) (factorio.override (import ./secrets/factorio.nix))
freecad-wayland
]; ];
# make chromium-based stuff use wayland # make chromium-based stuff use wayland

View File

@@ -39,6 +39,11 @@ let
sha256 = "L29ZQlDDJlh538cgAGuo/ijtBQvZ0vloH4vdJ1oIe5I="; sha256 = "L29ZQlDDJlh538cgAGuo/ijtBQvZ0vloH4vdJ1oIe5I=";
}; };
cmakeFlags = old.cmakeFlags ++ [
"-DGGML_VULKAN=ON"
"-DGGML_KOMPUTE=ON"
];
patches = old.patches ++ [ patches = old.patches ++ [
./disable-settings-err.patch ./disable-settings-err.patch
./disable-version-check.patch ./disable-version-check.patch