Update a package: Difference between revisions
imported>Makefu m Makefu moved page Updating a package in Nixpkgs to Nixpkgs/Update a package |
imported>Jtojnar m do not use pkgconfig alias |
||
| Line 65: | Line 65: | ||
* We will dive (not too deep, though) on <tt>pkgs/applications/window-managers/i3/default.nix</tt> which is the nix expression that corresponds to the package for the i3 window manager: | * We will dive (not too deep, though) on <tt>pkgs/applications/window-managers/i3/default.nix</tt> which is the nix expression that corresponds to the package for the i3 window manager: | ||
<syntaxhighlight lang="nix"> | <syntaxhighlight lang="nix"> | ||
{ fetchurl, stdenv, which, | { fetchurl, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutil, | ||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | ||
libXcursor, coreutils, perl, pango }: | libXcursor, coreutils, perl, pango }: | ||
| Line 78: | Line 78: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | ||
| Line 126: | Line 126: | ||
+++ b/pkgs/applications/window-managers/i3/default.nix | +++ b/pkgs/applications/window-managers/i3/default.nix | ||
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | ||
{ fetchurl, stdenv, which, | { fetchurl, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutil, | ||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | ||
- libXcursor, coreutils, perl }: | - libXcursor, coreutils, perl }: | ||
| Line 142: | Line 142: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
- libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | - libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | ||
+ libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | + libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | ||
| Line 298: | Line 298: | ||
+++ b/pkgs/applications/window-managers/i3/default.nix | +++ b/pkgs/applications/window-managers/i3/default.nix | ||
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | ||
{ fetchurl, stdenv, which, | { fetchurl, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutil, | ||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | ||
- libXcursor, coreutils, perl }: | - libXcursor, coreutils, perl }: | ||
| Line 314: | Line 314: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
- libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | - libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | ||
+ libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | + libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | ||
| Line 337: | Line 337: | ||
+++ b/pkgs/applications/window-managers/i3/default.nix | +++ b/pkgs/applications/window-managers/i3/default.nix | ||
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | ||
{ fetchurl, stdenv, which, | { fetchurl, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutil, | ||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | ||
- libXcursor, coreutils, perl }: | - libXcursor, coreutils, perl }: | ||
| Line 353: | Line 353: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
- libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | - libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | ||
+ libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | + libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | ||
| Line 365: | Line 365: | ||
Split into 5 hunks. | Split into 5 hunks. | ||
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | ||
{ fetchurl, stdenv, which, | { fetchurl, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutil, | ||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, | ||
- libXcursor, coreutils, perl }: | - libXcursor, coreutils, perl }: | ||
| Line 391: | Line 391: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
Stage this hunk [y,n,q,a,d,/,K,j,J,g,e,?]? n | Stage this hunk [y,n,q,a,d,/,K,j,J,g,e,?]? n | ||
@@ -12,6 +12,6 @@ | @@ -12,6 +12,6 @@ | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
- libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | - libstartup_notification libX11 pcre libev yajl libXcursor perl ]; | ||
+ libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | + libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; | ||
| Line 434: | Line 434: | ||
}; | }; | ||
buildInputs = [ which | buildInputs = [ which pkg-config libxcb xcbutilkeysyms xcbutil xcbutilwm | ||
</syntaxhighlight> | </syntaxhighlight> | ||
* As these changes are both related, we can issue a simple commit: | * As these changes are both related, we can issue a simple commit: | ||