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: bab973a28b3d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41bb69fa88c0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 29, 2018

  1. typora: gnome2 cleanup (#41167)

    worldofpeace authored and xeji committed May 29, 2018
    Copy the full SHA
    41bb69f View commit details
Showing with 5 additions and 6 deletions.
  1. +5 −6 pkgs/applications/editors/typora/default.nix
11 changes: 5 additions & 6 deletions pkgs/applications/editors/typora/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "typora-${version}";
@@ -20,10 +20,9 @@ stdenv.mkDerivation rec {

rpath = stdenv.lib.makeLibraryPath [
alsaLib
gnome2.GConf
gnome2.gtk
gnome2.gdk_pixbuf
gnome2.pango
gnome3.gconf
gdk_pixbuf
pango
gnome3.defaultIconTheme
expat
gtk3