diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-09 00:15:13 -0400 |
|---|---|---|
| committer | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-09 00:15:13 -0400 |
| commit | 81cb6ccb576d44277bae074dc5349fc47f1c8b42 (patch) | |
| tree | 4f7775daa4466faab5f543c7eb2f849f4c562cd2 | |
| parent | 3f22f3a044c4e4d86d28b00d8fb26e9138db6576 (diff) | |
| download | nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar.gz nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar.bz2 nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar.lz nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar.xz nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.tar.zst nixpkgs-81cb6ccb576d44277bae074dc5349fc47f1c8b42.zip | |
ja2-stracciatella: upgrade cargo fetcher and cargoSha256
| -rw-r--r-- | pkgs/games/ja2-stracciatella/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index a08ce593012..89d75dd837f 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }: -with rustPlatform; let version = "0.16.1"; src = fetchFromGitHub { @@ -18,12 +17,11 @@ let cp ${lockfile} $out/Cargo.lock ''; }; - libstracciatella = buildRustPackage { - name = "libstracciatella-${version}"; + libstracciatella = rustPlatform.buildRustPackage { + pname = "libstracciatella"; inherit version; src = libstracciatellaSrc; - legacyCargoFetcher = true; - cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4"; + cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc"; doCheck = false; }; in @@ -37,15 +35,17 @@ stdenv.mkDerivation { patches = [ ./remove-rust-buildstep.patch ]; + preConfigure = '' sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; enableParallelBuilding = true; + meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; - homepage = https://ja2-stracciatella.github.io/; + homepage = "https://ja2-stracciatella.github.io/"; }; } |