ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130332 from bobby285271/pantheon-test

Browse Source 
pantheon.elementary-code: 3.4.1 -> 6.0.0
This commit is contained in:
Jan Tojnar 2021-07-17 04:07:13 +02:00 committed by GitHub
commit 3d3e88394e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, pantheon , pantheon
, pkg-config , pkg-config
@ -12,11 +11,12 @@
, gtk3 , gtk3
, granite , granite
, libgee , libgee
, libhandy
, elementary-icon-theme , elementary-icon-theme
, appstream , appstream
, libpeas , libpeas
, editorconfig-core-c , editorconfig-core-c
, gtksourceview3 , gtksourceview4
, gtkspell3 , gtkspell3
, libsoup , libsoup
, vte , vte
@ -25,11 +25,12 @@
, ctags , ctags
, libgit2-glib , libgit2-glib
, wrapGAppsHook , wrapGAppsHook
, polkit
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-code"; pname = "elementary-code";
version = "3.4.1"; version = "6.0.0";
repoName = "code"; repoName = "code";
@ -37,17 +38,9 @@ stdenv.mkDerivation rec {
owner = "elementary"; owner = "elementary";
repo = repoName; repo = repoName;
rev = version; rev = version;
sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f";
}; };
patches = [
# Fix build with latest Vala.
(fetchpatch {
url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch";
sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA=";
})
];
passthru = { passthru = {
updateScript = nix-update-script { updateScript = nix-update-script {
attrPath = "pantheon.${pname}"; attrPath = "pantheon.${pname}";
@ -60,6 +53,10 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
# polkit is needed for ITS rules
polkit
python3 python3
vala vala
wrapGAppsHook wrapGAppsHook
@ -71,10 +68,11 @@ stdenv.mkDerivation rec {
elementary-icon-theme elementary-icon-theme
granite granite
gtk3 gtk3
gtksourceview3 gtksourceview4
gtkspell3 gtkspell3
libgee libgee
libgit2-glib libgit2-glib
libhandy
libpeas libpeas
libsoup libsoup
vte vte