From 69ea22c3da1a488ec5c7683ba55d146fdb5174d7 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sun, 28 Feb 2021 10:09:56 -0500 Subject: [PATCH] gnome-tour: fix build --- pkgs/desktops/gnome-3/core/gnome-tour/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 2b84442620db..61f8761ce817 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , gettext , meson @@ -15,9 +16,11 @@ , gnome3 , libhandy , librsvg +, rustc +, cargo }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "gnome-tour"; version = "3.38.0"; @@ -30,6 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ appstream-glib + cargo desktop-file-utils gettext glib # glib-compile-resources @@ -37,6 +41,8 @@ rustPlatform.buildRustPackage rec { ninja pkg-config python3 + rustPlatform.cargoSetupHook + rustc wrapGAppsHook ]; @@ -48,12 +54,6 @@ rustPlatform.buildRustPackage rec { librsvg ]; - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py