2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-25 21:44:49 +00:00

Merge pull request from worldofpeace/fix-rust-plus-gnome

gnome-tour: fix build
This commit is contained in:
WORLDofPEACE 2021-02-28 11:01:24 -05:00 committed by GitHub
commit 7a934e475e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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