diff options
Diffstat (limited to 'pkgs/desktops')
53 files changed, 49 insertions, 465 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch deleted file mode 100644 index 89e3694a02d9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 -+++ configure.ac 2015-04-08 18:55:55.697225280 +0200 -@@ -113,6 +113,7 @@ - PKG_CHECK_MODULES(WEB_EXTENSION, [ - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) - AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch deleted file mode 100644 index 89e3694a02d9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 -+++ configure.ac 2015-04-08 18:55:55.697225280 +0200 -@@ -113,6 +113,7 @@ - PKG_CHECK_MODULES(WEB_EXTENSION, [ - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) - AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix index 026227910f21..542ff24f5e65 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bomber.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; + description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix index b0e7d99c589f..89dff46129b6 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bovo.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; + description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix index 9f1ab0053099..50c3bf985b5b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix +++ b/pkgs/desktops/kde-4.14/kdegames/granatier.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; + description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix index 9a6f5e836955..cea4fb38b4fb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix @@ -8,6 +8,6 @@ kde rec { postInstall = "wrapPythonPrograms"; meta = { - description = "an ancient Chinese board game for 4 players"; + description = "An ancient Chinese board game for 4 players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix index f10e099da3cc..616533911ff8 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kapman.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the well known game Pac-Man"; + description = "A clone of the well known game Pac-Man"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix index a9936c04f0ea..3f7c1343289a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix +++ b/pkgs/desktops/kde-4.14/kdegames/katomic.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and educational puzzle game built around molecular geometry"; + description = "A fun and educational puzzle game built around molecular geometry"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix index 27eeff2f65bb..1e20cf0051ea 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; + description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix index 98cf068de09a..08e8c62d2629 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic single player falling blocks puzzle game"; + description = "A classic single player falling blocks puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix index 77fa0db63529..291e4c65a43a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game with the elements of puzzle"; + description = "A single player arcade game with the elements of puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix index 3a484d919bbb..4c5b2f62852f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; + description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix index 06dfcee5ac39..b21a945a64b9 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; + description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix index 11b8838e7082..6504d069660b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a board game for two players based on the Connect-Four game"; + description = "A board game for two players based on the Connect-Four game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix index 6217c47a8065..86aff7e77ace 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; + description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix index 32eee67cc1e0..e417e89a0078 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kigo.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an open-source implementation of the popular Go game"; + description = "An open-source implementation of the popular Go game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix index d9c1472495e7..9d8b307be756 100644 --- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix +++ b/pkgs/desktops/kde-4.14/kdegames/killbots.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple game of evading killer robots"; + description = "A simple game of evading killer robots"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix index 72f7ab67501b..433991abd75b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an addictive and fun dice game, designed to be played by as many as six players"; + description = "An addictive and fun dice game, designed to be played by as many as six players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix index a6d22cff51c3..888dba71b662 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple dice driven tactical game"; + description = "A simple dice driven tactical game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix index b592bc40641f..87415f9a4f81 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klickety.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a puzzle game where the player removes groups of colored marbles to clear the board"; + description = "A puzzle game where the player removes groups of colored marbles to clear the board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix index 90952fe91c07..e5c32d3fa9ab 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; + description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix index 946b531ff127..6aca3c229946 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; + description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix index 538454e95984..c02a61506d75 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic Minesweeper game"; + description = "A classic Minesweeper game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix index 42ffd2fcb4d5..aed9b48511ac 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Battle Ship game"; + description = "A Battle Ship game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix index a16e578ce848..d7a80f133168 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; + description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix index 78815ee57996..67a75cb9a36f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kolf.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a miniature golf game"; + description = "A miniature golf game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix index 3147c7305ea0..b0911d093ddd 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kollision.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple ball dodging game"; + description = "A simple ball dodging game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix index 53ddd64928cc..974730a46d0b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix +++ b/pkgs/desktops/kde-4.14/kdegames/konquest.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "the KDE version of Gnu-Lactic Konquest"; + description = "The KDE version of Gnu-Lactic Konquest"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix index b60afa786d17..f33ddfb8570c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix @@ -3,6 +3,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; nativeBuildInputs = [ shared_mime_info ]; meta = { - description = "a relaxing card sorting game"; + description = "A relaxing card sorting game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix index 2aed981428e1..065ee4bb657c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; + description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix index 9c8880340388..085b91584c70 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "a solitaire-like game played using the standard set of Mahjong tiles"; + description = "A solitaire-like game played using the standard set of Mahjong tiles"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix index 767eb67971a8..bfdd8f358dd1 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames qca2 ]; meta = { - description = "a computerized version of the well known strategic board game Risk"; + description = "A computerized version of the well known strategic board game Risk"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix index ccf1fb551e9a..ce5e75336c97 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple Tron-Clone"; + description = "A simple Tron-Clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix index 5285f7916cad..692eb1c085af 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; + description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix index a17be2da6325..7cad6bf0e5ae 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; + description = "A game modeled after the well known pen and paper based game of Dots and Boxes"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix index ea4e13a5e4f3..72a6a72b66d5 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a logic-based symbol placement puzzle"; + description = "A logic-based symbol placement puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix index 1a6ba9d653c2..a4480864fd8b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple constructor game suitable for children and adults alike"; + description = "A simple constructor game suitable for children and adults alike"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix index 9bdc6879db4b..f80cf4a8b356 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game based on the Rubik's Cube™ puzzle"; + description = "A game based on the Rubik's Cube™ puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix index 383b347dc330..d7687c1435f7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a library for KMahjongg game"; + description = "A library for KMahjongg game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix index 2a5050cd6676..d3e8268784bb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/lskat.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; + description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix index ddecc78c75bc..a73fcf100eb7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix @@ -8,6 +8,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single-player jigsaw puzzle game"; + description = "A single-player jigsaw puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix index 165d7422f95b..77dcdcf48dce 100644 --- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/picmi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player logic-based puzzle game"; + description = "A single player logic-based puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix index 4c56e7529dd7..20e63baf723f 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; meta = { - description = "transparent audio CD access for applications using the KDE Platform"; + description = "Transparent audio CD access for applications using the KDE Platform"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix index 006300742ecd..bb44c3b7234e 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a multimedia player with the focus on simplicity"; + description = "A multimedia player with the focus on simplicity"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix index 45f6c9abcb66..2311b1dda589 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ffmpeg ]; meta = { - description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; + description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix index 93365b194b2e..1bf5584de2fa 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix @@ -5,6 +5,6 @@ kde { buildInputs = [ kdelibs taglib_1_9 libtunepimp ]; meta = { - description = "an audio jukebox application"; + description = "An audio jukebox application"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix index 8d8bc84e16ef..4d36aaf4f68a 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libcanberra libpulseaudio ]; meta = { - description = "sound mixer, an application to allow you to change the volume of your sound card"; + description = "Sound mixer, an application to allow you to change the volume of your sound card"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix index 720b01d1861e..66b0cfe869f6 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix @@ -3,6 +3,6 @@ kde { #todo: libmusicbrainz5 buildInputs = [ kdelibs ]; meta = { - description = "a library used to retrieve audio CD meta data from the internet"; + description = "A library used to retrieve audio CD meta data from the internet"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix index c88ebcc2a5a3..c34b849f4c92 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a video thumbnail generator for KDE"; + description = "A video thumbnail generator for KDE"; }; } diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix index 5c357cede8e9..5d4f83e26562 100644 --- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix +++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix @@ -6,6 +6,6 @@ kde { preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}"; meta = { - description = "various KDE development utilities"; + description = "Various KDE development utilities"; }; } diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch deleted file mode 100644 index eea0ae4c199d..000000000000 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch +++ /dev/null @@ -1,372 +0,0 @@ -Index: plasma-workspace-5.5.5/startkde/startkde.cmake -=================================================================== ---- plasma-workspace-5.5.5.orig/startkde/startkde.cmake -+++ plasma-workspace-5.5.5/startkde/startkde.cmake -@@ -1,8 +1,36 @@ --#!/bin/sh -+#!@bash@ - # - # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+set -x -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $HOME/.config/Trolltech.conf ]; then -+ @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -+fi -+ -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kbuildsycoca5@ -+ - if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing -@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --else -- qdbus=qdbus --fi -- - # Check if a KDE session already is running and whether it's possible to connect to X --kcheckrunning -+@kcheckrunning@ - kcheckrunning_result=$? - if test $kcheckrunning_result -eq 0 ; then -- echo "KDE seems to be already running on this display." -- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null -+ echo "KDE seems to be already running on this display." -+ @xmessage@ -geometry 500x100 "KDE seems to be already running on this display." - exit 1 - elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+ exit 1 - fi - - # Boot sequence: -@@ -57,13 +72,8 @@ fi - # * Then ksmserver is started which takes control of the rest of the startup sequence - - # We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html --fi -- --mkdir -p $configDir -+configDir=$(@qtpaths@ --writable-path GenericConfigLocation) -+mkdir -p "$configDir" - - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys <<EOF -@@ -102,42 +112,10 @@ XftSubPixel=none - EOF - } - --# Make sure the Oxygen font is installed --# This is necessary for setups where CMAKE_INSTALL_PREFIX --# is not in /usr. fontconfig looks in /usr, ~/.fonts and --# $XDG_DATA_HOME for fonts. In this case, we symlink the --# Oxygen font under ${XDG_DATA_HOME} and make it known to --# fontconfig -- --usr_share="/usr/share" --install_share="@KDE_INSTALL_FULL_DATADIR@" -- --if [ ! $install_share = $usr_share ]; then -- -- if [ ${XDG_DATA_HOME} ]; then -- fontsDir="${XDG_DATA_HOME}/fonts" -- else -- fontsDir="${HOME}/.fonts" -- fi -- -- test -d $fontsDir || { -- mkdir -p $fontsDir -- } -- -- oxygenDir=$fontsDir/oxygen -- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" -- -- # if the oxygen dir doesn't exist, create a symlink to be sure that the -- # Oxygen font is available to the user -- test -d $oxygenDir || test -d $prefixDir && { -- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir -- } --fi -- --kstartupconfig5 -+@out@/bin/kstartupconfig5 - returncode=$? - if test $returncode -ne 0; then -- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." -+ @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." - exit 1 - fi - [ -r $configDir/startupconfig ] && . $configDir/startupconfig -@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor - export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor - fi - -+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":") -+export XCURSOR_PATH -+ - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver - if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ - - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then -@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem - fi - fi - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp <<EOF --Xft.dpi: $kcmfonts_general_forcefontdpi --EOF --fi -+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -+# from some users that they're confused and don't know what to do. This is -+# especially necessary on slow machines, where starting KDE takes one or two -+# minutes until anything appears on the screen. -+# -+# If the user has overwritten fonts, the cursor font may be different now -+# so don't move this up. -+# -+@xsetroot@ -cursor_name left_ptr - - dl=$DESKTOP_LOCKED - unset DESKTOP_LOCKED # Don't want it in the environment - -+# Make sure that D-Bus is running -+# D-Bus autolaunch is broken -+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -+ eval `@dbus-launch@ --sh-syntax --exit-with-session` -+fi -+if @qdbus@ >/dev/null 2>/dev/null; then -+ : # ok -+else -+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -+ exit 1 -+fi -+ - ksplash_pid= - if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) -- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` -+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; -@@ -201,8 +199,7 @@ fi - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g') - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override - usr_fdir=$HOME/.fonts - - if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts - else -@@ -245,23 +242,13 @@ fi - # add the user's dirs to the font path, as they might simply have been made - # read-only by the administrator, for whatever reason. - --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@ +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir" - - # Ask X11 to rebuild its font list. --xset fp rehash -- --# Set a left cursor instead of the standard X11 "X" cursor, since I've heard --# from some users that they're confused and don't know what to do. This is --# especially necessary on slow machines, where starting KDE takes one or two --# minutes until anything appears on the screen. --# --# If the user has overwritten fonts, the cursor font may be different now --# so don't move this up. --# --xsetroot -cursor_name left_ptr -+@xset@ fp rehash - - # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap - if test -n "$GS_LIB" ; then -@@ -274,26 +261,6 @@ fi - - echo 'startkde: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then -- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- --# Make sure that D-Bus is running --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -- exit 1 --fi -- -- - # Mark that full KDE session is running (e.g. Konqueror preloading works only - # with full KDE running). The KDE_FULL_SESSION property can be detected by - # any X client connected to the same X session, even if not launched -@@ -318,11 +285,11 @@ fi - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - KDE_SESSION_UID=`id -ru` - export KDE_SESSION_UID -@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP - - # At this point all the environment is ready, let's send it to kwalletd if running - if test -n "$PAM_KWALLET_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN - fi - # ...and also to kwalletd5 - if test -n "$PAM_KWALLET5_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -+ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN - fi - - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -349,18 +316,18 @@ if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@ -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - -@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" - test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true` - - if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- $qdbus "$address" "/MainApplication" "quit" -+ @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do -+ @qdbus@ "$address" "/MainApplication" "quit" - done - break - fi -@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - - # Clean up --kdeinit5_shutdown -+@kdeinit5_shutdown@ - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@xprop@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@xprop@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 7d5447ae52ab..bb04df6134d4 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { vte_290 libgee gsettings_desktop_schemas defaultIconTheme ]; meta = { - description = "elementary OS's terminal"; + description = "Elementary OS's terminal"; longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; homepage = https://launchpad.net/pantheon-terminal; license = stdenv.lib.licenses.gpl3; |