summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorWORLDofPEACE <worldofpeace@protonmail.ch>2021-02-28 10:09:56 -0500
committerWORLDofPEACE <worldofpeace@protonmail.ch>2021-02-28 10:17:31 -0500
commit69ea22c3da1a488ec5c7683ba55d146fdb5174d7 (patch)
treed88fc34f57d47922eb92ae4a072164c6bc8448d5 /pkgs/desktops
parent4995bd5105131297a1df0fafd3f2b12cb120edaa (diff)
downloadnixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar.gz
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar.bz2
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar.lz
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar.xz
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.tar.zst
nixpkgs-69ea22c3da1a488ec5c7683ba55d146fdb5174d7.zip
gnome-tour: fix build
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-tour/default.nix14
1 files 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 2b84442620d..61f8761ce81 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