ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-16 09:28:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #274993 from bobby285271/upd/cinnamon

Browse Source 
Cinnamon updates 2023-12-17
This commit is contained in:
Bobby Rong 2023-12-18 21:19:52 +08:00 committed by GitHub
commit b2903ac56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/cinnamon/folder-color-switcher/default.nix
View File

@ -7,14 +7,14 @@
stdenvNoCC.mkDerivation rec {
pname = "folder-color-switcher";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
# They don't really do tags, this is just a named commit.
rev = "826df0b71c7c3b686421437eac86883945dc5956";
sha256 = "sha256-WdOTyladZ0U39wbhqsXzg9l3mJ5UGV99yVg1PWscP2w=";
rev = "ebab2114649cc688a05e30857f6706f16fe82307";
sha256 = "sha256-/VbgFuSoeDIiJG4owXbn7yT0ILrAdKkkhSkScnnJa+8=";
};
nativeBuildInputs = [
@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
postPatch = ''
substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \
--replace "/usr/share/locale" "$out/share" \
--replace "/usr/share/locale" "$out/share/locale" \
--replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \
--replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg"

4
pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
View File

@ -1,6 +1,7 @@
{ python3
, lib
, fetchFromGitHub
, cinnamon-translations
}:
let
@ -17,6 +18,9 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "/usr/share" "share"
substituteInPlace nemo-extension/nemo-emblems.py \
--replace "/usr/share/locale" "${cinnamon-translations}/share/locale"
'';
meta = with lib; {

4
pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
View File

@ -8,6 +8,7 @@
, gtk3
, nemo
, gnome
, cinnamon-translations
}:
let
@ -33,7 +34,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/nemo-fileroller.c \
--replace "file-roller" "${lib.getExe gnome.file-roller}"
--replace "file-roller" "${lib.getExe gnome.file-roller}" \
--replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale"
'';
PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}";

4
pkgs/desktops/cinnamon/nemo-extensions/srcs.nix
View File

@ -4,12 +4,12 @@ rec {
# When you bump this, you should make sure all nemo-extensions
# are actually using this file since we try to deal with tags
# like nemo-fileroller-5.6.1 according to upstream's wishes.
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-M8ImntyfFfSL591UpqZosE7F8ydbpfrBhcLOBtW/sGQ=";
sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q=";
};
}