diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
| commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
| tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/applications/window-managers | |
| parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
| parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
| download | nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/i3/lock-fancy.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 39eb0586f7b2..09c36835dad6 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -3,7 +3,7 @@ , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool -, ORBit2, libXau +, ORBit2, libXau, libICE, libSM , dbus, dbus_glib, librsvg, mesa , libXdmcp, libnotify, python , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus @@ -15,18 +15,18 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.12.2"; + version="0.9.13.0"; name="${baseName}-${version}"; - hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9"; - url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2"; - sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9"; + hash="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; + url="https://launchpad.net/compiz/0.9.13/0.9.13.0/+download/compiz-0.9.13.0.tar.bz2"; + sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification metacity libpthreadstubs libxcb intltool - ORBit2 libXau + ORBit2 libXau libICE libSM dbus dbus_glib librsvg mesa libXdmcp libnotify python hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index dd7f89b2a8de..378001528b1f 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk -, i3lock-color +, i3lock-color, getopt, fontconfig }: stdenv.mkDerivation rec { @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock + sed -i -e "s|getopt |${getopt}/bin/getopt |" lock + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy |