diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
| commit | 33e1c78ae3681719b389d4ead425afa4433f445d (patch) | |
| tree | 015a86dbeb3b745e5daf876c184ccbd6b91f2db2 /pkgs/desktops/gnome-3 | |
| parent | 1747d28e5ada05ec07c4b1d35048ea5b194bde64 (diff) | |
| parent | 888efed972d95e1f2bc31e4394ff841f0690d216 (diff) | |
| download | nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar.gz nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar.bz2 nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar.lz nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar.xz nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.tar.zst nixlib-33e1c78ae3681719b389d4ead425afa4433f445d.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/vte/default.nix | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index 1b83bc061b7a..e77e9e19970c 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" # hack to make test-endianess happy diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix index 38850f0fe761..6b7eb8040082 100644 --- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix @@ -19,10 +19,6 @@ let baseAttrs = rec { enableParallelBuilding = true; - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - meta = with stdenv.lib; { homepage = http://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; |