diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-26 09:01:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-26 09:23:32 +0000 |
| commit | aa21a71c40eec52b42454bf197ca4007ef9b15bb (patch) | |
| tree | ecb8332f928a5541661e08a79db8bb8353ff2321 /host/start-vm/default.nix | |
| parent | 6ad8b10ea1dde7bc0b98b53c6b97ebf2d3bc8e75 (diff) | |
| download | spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar.gz spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar.bz2 spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar.lz spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar.xz spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.tar.zst spectrum-aa21a71c40eec52b42454bf197ca4007ef9b15bb.zip | |
host/start-vm: drop Meson patch
The patch made its way into the Meson release now in Nixpkgs!
Diffstat (limited to 'host/start-vm/default.nix')
| -rw-r--r-- | host/start-vm/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/host/start-vm/default.nix b/host/start-vm/default.nix index 6971d0d..ac31022 100644 --- a/host/start-vm/default.nix +++ b/host/start-vm/default.nix @@ -2,19 +2,10 @@ # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> { pkgs ? import <nixpkgs> {} }: pkgs.callPackage ( -{ pkgsBuildHost, lib, stdenv, fetchpatch, ninja, rustc }: +{ lib, stdenv, fetchpatch, meson, ninja, rustc }: let inherit (lib) cleanSource; - - meson' = pkgsBuildHost.meson.overrideAttrs ({ patches ? [], ... }: { - patches = patches ++ [ - (fetchpatch { - url = "https://github.com/alyssais/meson/commit/e8464d47fa8971098d626744b14db5d066ebf753.patch"; - sha256 = "0naxj0s16w6ffk6d7xg1m6kkx2a7zd0hz8mbvn70xy1k12a0c5gy"; - }) - ]; - }); in stdenv.mkDerivation { @@ -22,7 +13,7 @@ stdenv.mkDerivation { src = cleanSource ./.; - nativeBuildInputs = [ meson' ninja rustc ]; + nativeBuildInputs = [ meson ninja rustc ]; doCheck = true; } |