Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6357408f752e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 307931388c92
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on May 17, 2020

  1. Copy the full SHA
    b4854c5 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fb07bcf View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7c0e735 View commit details

Commits on May 20, 2020

  1. Merge pull request #88020 from romildo/upd.canta-theme

    canta-theme: 2020-01-31 -> 2020-05-17
    romildo authored May 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3079313 View commit details
Showing with 38 additions and 7 deletions.
  1. +38 −7 pkgs/data/themes/canta/default.nix
45 changes: 38 additions & 7 deletions pkgs/data/themes/canta/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,57 @@
{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
{ stdenv
, fetchFromGitHub
, gdk-pixbuf
, librsvg
, gtk-engine-murrine
, gtk3
, gnome3
, gnome-icon-theme
, numix-icon-theme-circle
, hicolor-icon-theme
}:

stdenv.mkDerivation rec {
pname = "canta-theme";
version = "2020-01-31";
version = "2020-05-17";

src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "070lhbhh3n7nd6rkwm52v1x4v8spyb932w6qmgs2r19g0whyn55w";
sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0";
};

buildInputs = [ gdk-pixbuf librsvg ];
nativeBuildInputs = [
gtk3
];

propagatedUserEnvPkgs = [ gtk-engine-murrine ];
buildInputs = [
gdk-pixbuf
librsvg
];

propagatedBuildInputs = [
gnome3.adwaita-icon-theme
gnome-icon-theme
numix-icon-theme-circle
hicolor-icon-theme
];

propagatedUserEnvPkgs = [
gtk-engine-murrine
];

dontDropIconThemeCache = true;

installPhase = ''
patchShebangs .
mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes
install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg
name= ./install.sh --dest $out/share/themes
rm $out/share/themes/*/{AUTHORS,COPYING}
install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg
mkdir -p $out/share/icons
cp -a icons/Canta $out/share/icons
gtk-update-icon-cache $out/share/icons/Canta
'';

meta = with stdenv.lib; {