public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cinnamon: various fixes

Browse Source 
cinnamon-translations: use $out/share instead of $out/usr/share,
add version into name

all-packages.nix: refactor
This commit is contained in:
Vladimír Čunát 2013-12-07 14:27:21 +01:00
parent 6690c97569
commit b36ed39f2e
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/cinnamon/cinnamon-translations.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl}: { stdenv, fetchurl }:
let
stdenv.mkDerivation rec { version = "2.0.3";
name = "cinnamon-translations"; in
version="2.0.3"; stdenv.mkDerivation {
name = "cinnamon-translations-${version}";
src = fetchurl { src = fetchurl {
url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"; url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc"; sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
}; };
installPhase = installPhase =
'' ''
mkdir -pv $out/usr/share/cinnamon/locale mkdir -pv $out/share/cinnamon/locale
cp -av mo-export/* $out/usr/share/cinnamon/locale/ cp -av mo-export/* $out/share/cinnamon/locale/
''; '';
meta = { meta = {
@ -25,5 +25,3 @@ stdenv.mkDerivation rec {
}; };
} }

17
pkgs/top-level/all-packages.nix
View File

@ -9586,17 +9586,16 @@ let
### DESKTOP ENVIRONMENTS ### DESKTOP ENVIRONMENTS
cinnamon = recurseIntoAttrs {
cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
};
cinnamon = recurseIntoAttrs { cinnamon = recurseIntoAttrs rec {
callPackage = newScope pkgs.cinnamon;
inherit (gnome3) gnome_common;
cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };
cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
cjs = callPackage ../desktops/cinnamon/cjs.nix { }; cjs = callPackage ../desktops/cinnamon/cjs.nix { };
cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix {
inherit (gnome3) gnome_common;
};
}; };
enlightenment = callPackage ../desktops/enlightenment { }; enlightenment = callPackage ../desktops/enlightenment { };