summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-02-13 12:33:29 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-02-13 12:33:29 +0100
commit7257dedd7cf28634e08fc0458ed34a183065b70e (patch)
tree53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/misc
parent7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff)
parent563b491ce89bafaa928beba19a37f6381bfc60d0 (diff)
downloadnixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/themes/greybird/default.nix39
-rw-r--r--pkgs/misc/themes/zuki/default.nix30
2 files changed, 0 insertions, 69 deletions
diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
deleted file mode 100644
index 8cc1a6415fb..00000000000
--- a/pkgs/misc/themes/greybird/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "greybird";
-  version = "3.22.9";
-
-  src = fetchFromGitHub {
-    owner = "shimmerproject";
-    repo = "${pname}";
-    rev = "v${version}";
-    sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    which
-    sassc
-    glib
-    libxml2
-  ];
-
-  buildInputs = [
-    gdk_pixbuf
-    librsvg
-  ];
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
-    homepage = https://github.com/shimmerproject/Greybird;
-    license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
deleted file mode 100644
index 2c293ecbc4a..00000000000
--- a/pkgs/misc/themes/zuki/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "zuki-themes-${version}";
-  version = "3.28-3";
-
-  src = fetchFromGitHub {
-    owner = "lassekongo83";
-    repo = "zuki-themes";
-    rev = "v${version}";
-    sha256 = "0sgp41fpd8lyyb0v82y41v3hmb0ayv3zqqrv0m3ln0dzkr7ym9g7";
-  };
-
-  buildInputs = [ gdk_pixbuf librsvg ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  installPhase = ''
-    install -dm 755 $out/share/themes
-    cp -a Zuki* $out/share/themes/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Themes for GTK3, gnome-shell and more";
-    homepage = https://github.com/lassekongo83/zuki-themes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}