diff options
author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
tree | d3af676b9948c865f1e942e1db51862da5e19ad5 /pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
download | nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.zip |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix')
-rw-r--r-- | pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186bb..e06c1b5d307c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } |