mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
build(nix): fix git ref not found and git lfs check
This commit is contained in:
parent
e7f54d6306
commit
81bc3d1966
18
flake.lock
18
flake.lock
@ -24,11 +24,11 @@
|
||||
"rustOverlay": "rustOverlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1623601923,
|
||||
"narHash": "sha256-zQDRV3OMYKlewfp3k0ilmFNfcFDxBCCk0tbcde8HMYM=",
|
||||
"lastModified": 1624129119,
|
||||
"narHash": "sha256-Mq7SkCA35dEEbWWfO8by94/+sZbvWfv3P8ByxNCVmOg=",
|
||||
"owner": "yusdacra",
|
||||
"repo": "nix-cargo-integration",
|
||||
"rev": "ab922adefdeb387ce105b1bde75f62ffb971cec4",
|
||||
"rev": "4018999c0998137c34b81ff2ff032d719cd25096",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -39,11 +39,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1623176226,
|
||||
"narHash": "sha256-54a9uvHlIlK3i0b36HfGMc4zqM0BpMOOiFYBxEhQFK8=",
|
||||
"lastModified": 1623862044,
|
||||
"narHash": "sha256-mY7nldu9Wl/Yb0qMPihZrWw0bRWXNsk6iyYztw/6F6Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "51bb9f3e9ab6161a3bf7746e20b955712cef618b",
|
||||
"rev": "0747387223edf1aa5beaedf48983471315d95e16",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -62,11 +62,11 @@
|
||||
"rustOverlay": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1623550815,
|
||||
"narHash": "sha256-RumRrkE6OTJDndHV4qZNZv8kUGnzwRHZQSyzx29r6/g=",
|
||||
"lastModified": 1624069337,
|
||||
"narHash": "sha256-9mTcx7osE4biF2Hm/GU19s1T3+KvphWj4QaUcJh39lU=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "9824f142cbd7bc3e2a92eefbb79addfff8704cd3",
|
||||
"rev": "67dc2a9543a7c24591e6cb102ad0121c3a704aab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -26,7 +26,7 @@
|
||||
pkgs = common.pkgs;
|
||||
lib = common.lib;
|
||||
|
||||
gitLfsCheckFile = ./assets/voxygen/background/bg_main.png;
|
||||
gitLfsCheckFile = ./assets/voxygen/background/bg_main.jpg;
|
||||
utils = import ./nix/utils.nix { inherit pkgs; };
|
||||
|
||||
sourceInfo =
|
||||
|
@ -3,7 +3,7 @@
|
||||
let
|
||||
gitLfsCheckOutput =
|
||||
builtins.readFile (pkgs.runCommand "gitLfsCheck" { } ''
|
||||
([ "$(${pkgs.file}/bin/file --mime-type ${checkFile})" = "${checkFile}: image/png" ] && printf "0" || printf "1") > $out
|
||||
([ "$(${pkgs.file}/bin/file --mime-type ${checkFile})" = "${checkFile}: image/jpeg" ] && printf "0" || printf "1") > $out
|
||||
'');
|
||||
in
|
||||
if gitLfsCheckOutput == "0" then
|
||||
|
Loading…
Reference in New Issue
Block a user