JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pantheon.gnome-bluetooth-contract: use gnome-bluetooth_1_0

Browse Source
This commit is contained in:
Bobby Rong 2022-03-31 23:32:29 +08:00
parent baa0a8b9ef
commit 7ce8bc5d48
No known key found for this signature in database
GPG Key ID: ED07364437C91161
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -302,6 +302,7 @@ in
environment.systemPackages = with pkgs.pantheon; [
contractor
file-roller-contract
gnome-bluetooth-contract
];
environment.pathsToLink = [

2
pkgs/desktops/pantheon/default.nix
View File

@ -108,7 +108,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gala = callPackage ./desktop/gala { };
gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract {
inherit (gnome) gnome-bluetooth;
inherit (gnome) gnome-bluetooth_1_0;
};
wingpanel = callPackage ./desktop/wingpanel { };

9
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, unstableGitUpdater
, substituteAll
, gnome-bluetooth
, gnome-bluetooth_1_0
}:
stdenv.mkDerivation rec {
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./exec-path.patch;
gnome_bluetooth = gnome-bluetooth;
# sendto device selection is removed in gnome-bluetooth 42
# https://github.com/elementary/gnome-bluetooth-contract/issues/1
gnome_bluetooth = gnome-bluetooth_1_0;
})
];
@ -49,8 +51,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = teams.pantheon.members;
platforms = platforms.linux;
# sendto device selection is removed in gnome-bluetooth 42
# https://github.com/elementary/gnome-bluetooth-contract/issues/1
broken = true;
};
}