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: 7acfb5c2e869
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4f085036b34
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 7, 2019

  1. gtkd: 3.8.5 -> 3.9.0

    @worldofpeace
    worldofpeace committed Oct 7, 2019
    Copy the full SHA
    d73f96f View commit details

  2. tilix: 2019-08-03 -> 2019-10-02

    @worldofpeace
    worldofpeace committed Oct 7, 2019
    Copy the full SHA
    b4cd4b9 View commit details

Commits on Oct 12, 2019

  1. Merge pull request #70662 from worldofpeace/gtkd-update 

    gtkd: 3.8.5 -> 3.9.0
    @worldofpeace
    worldofpeace authored Oct 12, 2019
    Copy the full SHA
    d4f0850 View commit details
Showing with 86 additions and 63 deletions.
  1. +3 −12 pkgs/applications/misc/tilix/default.nix
  2. +79 −47 pkgs/development/libraries/gtkd/default.nix
  3. +4 −4 pkgs/development/libraries/gtkd/paths.d
15 changes: 3 additions & 12 deletions pkgs/applications/misc/tilix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,13 +21,13 @@

stdenv.mkDerivation {
pname = "tilix";
version = "unstable-2019-08-03";
version = "unstable-2019-10-02";

src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "09ec4e8e113703ca795946d8d2a83091e7b741e4";
sha256 = "1vvp6l25xygzhbhscg8scik8y59nl8a92ri024ijk0c0lclga05m";
rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
};

# Default upstream else LDC fails to link
@@ -56,15 +56,6 @@ stdenv.mkDerivation {
libunwind
];

patches = [
# Depends on libsecret optionally
# https://github.com/gnunn1/tilix/pull/1745
(fetchpatch {
url = "https://github.com/gnunn1/tilix/commit/e38dd182bfb92419d70434926ef9c0530189aab8.patch";
sha256 = "1ws4iyzi67crzlp9p7cw8jr752b3phcg5ymx5aj0bh6321g38kfk";
})
];

postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
126 changes: 79 additions & 47 deletions pkgs/development/libraries/gtkd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,122 @@
{ stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
, glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }:
{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }:

let
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
in stdenv.mkDerivation rec {
pname = "gtkd";
version = "3.8.5";
version = "3.9.0";

src = fetchzip {
url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky";
sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p";
stripRoot = false;
};

nativeBuildInputs = [ dmd pkgconfig which ];
propagatedBuildInputs = [
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
libgda libpeas librsvg pango vte
];

patches = [
# Fix makefile not installing .pc's
(fetchpatch {
url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch";
sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6";
})
];

prePatch = ''
substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
substituteInPlace src/cairo/c/functions-compiletime.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace src/cairo/c/functions-runtime.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \
--replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
--replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
substituteInPlace generated/gstreamer/gst/app/c/functions.d \
--replace libgstapp-1.0.so.0 ${gst-plugins-base}/lib/libgstapp-1.0.so.0 \
--replace libgstapp-1.0.0.dylib ${gst-plugins-base}/lib/libgstapp-1.0.0.dylib
substituteInPlace generated/gstreamer/gst/base/c/functions.d \
--replace libgstbase-1.0.so.0 ${gstreamer.out}/lib/libgstbase-1.0.so.0 \
--replace libgstbase-1.0.0.dylib ${gstreamer.out}/lib/libgstbase-1.0.0.dylib
substituteInPlace generated/gstreamer/gst/mpegts/c/functions.d \
--replace libgstmpegts-1.0.so.0 ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.so.0 \
--replace libgstmpegts-1.0.0.dylib ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.0.dylib
substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \
--replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \
--replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib
substituteInPlace generated/gstreamer/gstreamer/c/functions.d \
--replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
--replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
substituteInPlace generated/gtkd/atk/c/functions.d \
--replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
--replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
substituteInPlace generated/gtkd/pango/c/functions.d \
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
--replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
--replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
--replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
substituteInPlace generated/gtkd/gobject/c/functions.d \
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
--replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/rsvg/c/functions.d \
--replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
--replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
substituteInPlace generated/gtkd/cairo/c/functions.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace generated/gtkd/gdk/c/functions.d \
--replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
--replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib
substituteInPlace generated/peas/peas/c/functions.d \
--replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
--replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
--replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
--replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
substituteInPlace generated/vte/vte/c/functions.d \
--replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
--replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \
--replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \
--replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib
substituteInPlace generated/sourceview/gsv/c/functions.d \
--replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
--replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \
--replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
--replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
substituteInPlace generated/gtkd/gio/c/functions.d \
--replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \
--replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib
substituteInPlace generated/gtkd/glib/c/functions.d \
--replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \
--replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
--replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \
--replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \
--replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gio/c/functions.d \
--replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \
--replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib
substituteInPlace generated/gstreamer/gstreamer/c/functions.d \
--replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
--replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
substituteInPlace generated/gtkd/gobject/c/functions.d \
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
--replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gtk/c/functions.d \
--replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
--replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \
--replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \
--replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib
substituteInPlace generated/gtkd/pango/c/functions.d \
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
--replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
--replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
--replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
substituteInPlace generated/gtkd/rsvg/c/functions.d \
--replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
--replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
substituteInPlace generated/peas/peas/c/functions.d \
--replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
--replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
--replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
--replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
substituteInPlace generated/sourceview/gsv/c/functions.d \
--replace libgtksourceview-4.so.0 ${gtksourceview4}/lib/libgtksourceview-4.so.0 \
--replace libgtksourceview-4.0.dylib ${gtksourceview4}/lib/libgtksourceview-4.0.dylib
substituteInPlace generated/vte/vte/c/functions.d \
--replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
--replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
'';

installFlags = "prefix=$(out)";
makeFlags = [
"prefix=${placeholder "out"}"
"PKG_CONFIG=${pkgconfig}/bin/pkg-config"
];

meta = with stdenv.lib; {
description = "D binding and OO wrapper for GTK";
8 changes: 4 additions & 4 deletions pkgs/development/libraries/gtkd/paths.d
View file
Original file line number Diff line number Diff line change
@@ -103,8 +103,8 @@ else version(darwin)
LIBRARY.GLGDK: "libgdkglext-3.0.dylib",
LIBRARY.GLGTK: "libgtkglext-3.0.dylib",
LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib",
LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib",
LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib",
LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib",
LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib",
LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib",
@@ -131,8 +131,8 @@ else
LIBRARY.GLGDK: "libgdkglext-3.0.so.0",
LIBRARY.GLGTK: "libgtkglext-3.0.so.0",
LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4",
LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0",
LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1",
LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.so.0",
LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.so.0",
LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0",
LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0",
LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0",