Update dependencies

This commit is contained in:
Charlotte Van Petegem 2021-05-16 11:29:36 +02:00
parent 42f7c26676
commit 57bf854c77
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 9 additions and 73 deletions

18
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1621072981,
"narHash": "sha256-YkM+NSFX8e6WBcou+Or2wit6eBVK+poLGjGJu9iGE84=",
"lastModified": 1621158380,
"narHash": "sha256-r8pc3IFkEQ9MZDdSnR4+VUEnpjPsJYUzp+jJ5WZx9Qc=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "7320af085d29058bd39657ad6cc78c08e53b3174",
"rev": "cf0d6b88cb65565d732db0db12038dc1db47b859",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
]
},
"locked": {
"lastModified": 1620692082,
"narHash": "sha256-s/eBXs4OI47yPWNTKoAg4f/H7wMLyO+VEMmobXkzfI8=",
"lastModified": 1621135068,
"narHash": "sha256-aPJlgosfLp3QtPDFLf/N7qNpIo5Q45MpYyzlaACL2G4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "23769994e8f7b212d9a257799173b120ed87736b",
"rev": "77188bcd6e2c6c7a99253b36f08ed7b65f2901d2",
"type": "github"
},
"original": {
@ -54,11 +54,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1621077972,
"narHash": "sha256-dO3HQ0VhrgiiDM8l9ptys/KbJXAmzALRwXv/2+dhEZ4=",
"lastModified": 1621123012,
"narHash": "sha256-9GLNpyJ6tCAgYSbwfQAo/cC20VzMbiEt6UpQ9yLRDHs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "838e396944e3d9fe16faf155c6bf869f85f924d0",
"rev": "982240fd504363d06870a6be851e012885c5f558",
"type": "github"
},
"original": {

View file

@ -1,64 +0,0 @@
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index fff5e4bf41a..0ece2d6e0e0 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv
, fetchFromGitHub
, sassc
-, autoreconfHook
+, meson
+, ninja
, pkg-config
, gtk3
, gnome
@@ -13,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "arc-theme";
- version = "20210127";
+ version = "20210412";
src = fetchFromGitHub {
owner = "jnsh";
@@ -23,12 +24,15 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- autoreconfHook
+ meson
+ ninja
pkg-config
sassc
optipng
inkscape
gtk3
+ gnome.gnome-shell
+ cinnamon.cinnamon-common
];
propagatedUserEnvPkgs = [
@@ -43,14 +47,18 @@ stdenv.mkDerivation rec {
export HOME="$NIX_BUILD_ROOT"
'';
- configureFlags = [
- "--with-cinnamon=${cinnamon.cinnamon-common.version}"
- "--with-gnome-shell=${gnome.gnome-shell.version}"
- "--disable-unity"
+ mesonFlags = [
+ "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm"
+ "-Dvariants=light,darker,dark,lighter"
+ "-Dtransparency=true"
+ "-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
+ "-Dgnome_shell_version=${lib.elemAt (lib.splitString "-" gnome.gnome-shell.version) 0}"
+ "-Dgtk3_version=${gtk3.version}"
+ "-Dgnome_shell_resource=false"
];
postInstall = ''
- install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md
+ install -Dm644 -t $out/share/doc/${pname} $src/AUTHORS $src/*.md
'';
meta = with lib; {