diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-08-26 12:11:52 -0300 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2019-08-26 23:11:52 +0800 |
| commit | 86e1452556e811619b0762fdaa9e3006453fe07d (patch) | |
| tree | e6f4554c56ba328c8710a0bcddeae17e1939b38b | |
| parent | da1ff985aef12591772074f8e80698f36225c616 (diff) | |
theme-obsidian2: 2.8 -> 2.9 (#67501)
* theme-obsidian2: 2.8 -> 2.9
* theme-obsidian2: move to pkgs/data
* theme-obsidian2: use pname
* theme-obsidian2: run hooks preInstall and postInstall in install phase
| -rw-r--r-- | pkgs/data/themes/obsidian2/default.nix (renamed from pkgs/misc/themes/obsidian2/default.nix) | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 8a8e88ff6f96..3a2dcea4b3a5 100644 --- a/pkgs/misc/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,25 +1,23 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-obsidian2-${version}"; - version = "2.8"; + pname = "theme-obsidian2"; + version = "2.9"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq"; + sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = '' - sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme - ''; - installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a Obsidian-2 $out/share/themes + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe997367c83..267cbcc5bca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17104,6 +17104,8 @@ in gtk = res.gtk2; }; + theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; + themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; theano = callPackage ../data/fonts/theano { }; @@ -22741,8 +22743,6 @@ in theme-jade1 = callPackage ../misc/themes/jade1 { }; - theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; - theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { |