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

Merge pull request #148159 from bobby285271/pantheon

Browse Source 
pantheon.extra-elementary-contracts: split package
This commit is contained in:
Bobby Rong 2021-12-05 09:56:34 +08:00 committed by GitHub
commit 894fb34b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 122 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,9 +296,10 @@ in
})
(mkIf serviceCfg.contractor.enable {
environment.systemPackages = with pkgs.pantheon; [
environment.systemPackages = with pkgs.pantheon; [
contractor
extra-elementary-contracts
file-roller-contract
gnome-bluetooth-contract
];
environment.pathsToLink = [

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

@ -93,14 +93,18 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts {
inherit (gnome) file-roller gnome-bluetooth;
file-roller-contract = callPackage ./desktop/file-roller-contract {
inherit (gnome) file-roller;
};
gala = callPackage ./desktop/gala {
inherit (gnome) gnome-desktop;
};
gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract {
inherit (gnome) gnome-bluetooth;
};
wingpanel = callPackage ./desktop/wingpanel { };
wingpanel-with-indicators = callPackage ./desktop/wingpanel/wrapper.nix {
@ -217,4 +221,6 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
})

44
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
View File

@ -1,44 +0,0 @@
{ lib
, stdenv
, substituteAll
, fetchFromGitHub
, file-roller
, gnome-bluetooth
}:
stdenv.mkDerivation rec {
pname = "extra-elementary-contracts";
version = "2018-08-21";
src = fetchFromGitHub {
owner = "worldofpeace";
repo = pname;
rev = "a05dfb00695854163805b666185e3e9f31b6eb83";
sha256 = "0fkaf2w4xg0n9faj74rgzy7gvd3yz112l058b157a3pr39vpci7g";
};
patches = [
(substituteAll {
src = ./exec-path.patch;
file_roller = file-roller;
gnome_bluetooth = gnome-bluetooth;
})
];
dontBuild = true;
dontConfigure = true;
installPhase = ''
mkdir -p $out/share/contractor
cp *.contract $out/share/contractor/
'';
meta = with lib; {
description = "Extra contractor files for elementary";
homepage = "https://github.com/worldofpeace/extra-elementary-contracts";
license = licenses.gpl2;
maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.linux;
};
}

46
pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, file-roller
}:
stdenv.mkDerivation rec {
pname = "file-roller-contract";
version = "unstable-2021-02-23";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "cf001d84a7e2ddcfbee2cfdb19885798a869833e";
sha256 = "sha256-jnXq44NiQiSYsvaBF828TklLg9d6z6n+gCZKgbFiERI=";
};
patches = [
(substituteAll {
src = ./exec-path.patch;
file_roller = file-roller;
})
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/contractor
cp *.contract $out/share/contractor/
runHook postInstall
'';
meta = with lib; {
description = "Contractor extension for File Roller";
homepage = "https://github.com/elementary/file-roller-contract";
license = licenses.gpl3Plus;
maintainers = teams.pantheon.members;
platforms = platforms.linux;
};
}

28
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch → pkgs/desktops/pantheon/desktop/file-roller-contract/exec-path.patch
View File

@ -1,19 +1,18 @@
diff --git a/file-roller-compress.contract b/file-roller-compress.contract
index 8de5396..de7e939 100644
--- a/file-roller-compress.contract
+++ b/file-roller-compress.contract
@@ -3,6 +3,6 @@ Name=Compress
diff --git a/io.elementary.contractor.file-roller-compress.contract b/io.elementary.contractor.file-roller-compress.contract
index 11e4da3..d58549f 100644
--- a/io.elementary.contractor.file-roller-compress.contract
+++ b/io.elementary.contractor.file-roller-compress.contract
@@ -3,5 +3,5 @@ Name=Compress
Icon=add-files-to-archive
Description=Create a compressed archive with the selected objects
MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket;
-Exec=file-roller --add %U
+Exec=@file_roller@/bin/file-roller --add %U
Gettext-Domain=file-roller
diff --git a/file-roller-extract-here.contract b/file-roller-extract-here.contract
diff --git a/io.elementary.contractor.file-roller-extract-here.contract b/io.elementary.contractor.file-roller-extract-here.contract
index 184a6f2..345f4e7 100644
--- a/file-roller-extract-here.contract
+++ b/file-roller-extract-here.contract
--- a/io.elementary.contractor.file-roller-extract-here.contract
+++ b/io.elementary.contractor.file-roller-extract-here.contract
@@ -3,5 +3,5 @@ Name=Extract Here
Icon=extract-archive
Description=Extract the contents of the archives in the archive folder and quit the program
@ -21,14 +20,3 @@ index 184a6f2..345f4e7 100644
-Exec=file-roller --extract-here %U
+Exec=@file_roller@/bin/file-roller --extract-here %U
Gettext-Domain=file-roller
diff --git a/gnome-bluetooth.contract b/gnome-bluetooth.contract
index 745dbbe..8cc0102 100644
--- a/gnome-bluetooth.contract
+++ b/gnome-bluetooth.contract
@@ -3,5 +3,5 @@ Name=Send files via Bluetooth
Icon=bluetooth
Description=Send files to device...
MimeType=!inode;
-Exec=bluetooth-sendto %F
+Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F
Gettext-Domain=gnome-bluetooth2

46
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, gnome-bluetooth
}:
stdenv.mkDerivation rec {
pname = "gnome-bluetooth-contract";
version = "unstable-2021-02-23";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "8dcd4d03dc7a7d487980fd8bc95af985dc4fff5c";
sha256 = "sha256-9eX6j/cvN/CoqrHrh9mZEsUJ8viDWIGxIva1xFwIK7c=";
};
patches = [
(substituteAll {
src = ./exec-path.patch;
gnome_bluetooth = gnome-bluetooth;
})
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/contractor
cp *.contract $out/share/contractor/
runHook postInstall
'';
meta = with lib; {
description = "Contractor extension for GNOME Bluetooth";
homepage = "https://github.com/elementary/gnome-bluetooth-contract";
license = licenses.gpl3Plus;
maintainers = teams.pantheon.members;
platforms = platforms.linux;
};
}

11
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/io.elementary.contracter.gnome-bluetooth.contract b/io.elementary.contracter.gnome-bluetooth.contract
index 3eb2334..ce0e5f5 100644
--- a/io.elementary.contracter.gnome-bluetooth.contract
+++ b/io.elementary.contracter.gnome-bluetooth.contract
@@ -3,5 +3,5 @@ Name=Send Files via Bluetooth
Icon=bluetooth
Description=Send files to device...
MimeType=!inode;
-Exec=bluetooth-sendto %F
+Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F
Gettext-Domain=gnome-bluetooth2