Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cfd79b4d8a52
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1ed3c93f2141
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 27, 2018

  1. pantheon-terminal: fixes #10171 Using the 'memory' GSettings backend

    @davidak
    davidak committed Mar 27, 2018
    Copy the full SHA
    64340f4 View commit details

  2. Merge pull request #37896 from davidak/pantheon-terminal-1 

    pantheon-terminal: fixes "Using the 'memory' GSettings backend" issue
    @jtojnar
    jtojnar authored Mar 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    yurrriq Eric Bailey
    GPG key ID: 29E1B8D32C1635C4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ed3c93 View commit details
Showing with 2 additions and 13 deletions.
  1. +2 −13 pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
15 changes: 2 additions & 13 deletions pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:

stdenv.mkDerivation rec {
majorVersion = "0.4";
@@ -9,19 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
};

preConfigure = ''
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig"
'';

preFixup = ''
for f in $out/bin/*; do
wrapProgram $f \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
done
'';

nativeBuildInputs = [
perl cmake vala_0_38 pkgconfig makeWrapper
perl cmake vala_0_38 pkgconfig wrapGAppsHook
# For setup hook
gobjectIntrospection
];