Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 67bc63f9a7ac
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3bb58547b82
Choose a head ref
  • 4 commits
  • 5 files changed
  • 3 contributors

Commits on Apr 7, 2019

  1. shotcut: 18.12.23 -> 19.02.28 (#56875) 

    fixes build with qt 5.12, apparently

Backport of #56875
(cherry picked from commit ed76b08)
    @woffs @srhb
    woffs authored and srhb committed Apr 7, 2019
    Copy the full SHA
    30c67ec View commit details

  2. pantheon.elementary-greeter: correct substituteAll 

    (cherry picked from commit c2ac422)
    @worldofpeace
    worldofpeace committed Apr 7, 2019
    Copy the full SHA
    6fcb33a View commit details

  3. pantheon.elementary-greeter: hardcode elementary theme 

    For some reason correcting the path to the settings daemon
causes the icons to not be the elementary one's.

Hardcoding this fixes this very simply without
the need for the complicated wrapping.

(cherry picked from commit 536c72a)
    @worldofpeace
    worldofpeace committed Apr 7, 2019
    Copy the full SHA
    90e55a8 View commit details

  4. youtube-dl: 2019.04.01 -> 2019.04.07 

    (cherry picked from commit 0f620ef)
    @dtzWill @worldofpeace
    dtzWill authored and worldofpeace committed Apr 7, 2019
    Copy the full SHA
    a3bb585 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/video/shotcut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";

stdenv.mkDerivation rec {
name = "shotcut-${version}";
version = "18.12.23";
version = "19.02.28";

src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "1i6gkqvg31q7g5s3zgqzg4i5kyas7k4svclgbk459i5h1ar3v5vn";
sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr";
};

enableParallelBuilding = true;
6 changes: 2 additions & 4 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,13 +52,14 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./gsd.patch;
elementary-settings-daemon = "${elementary-settings-daemon}/libexec";
elementary_settings_daemon = "${elementary-settings-daemon}/libexec/";
})
(substituteAll {
src = ./numlockx.patch;
inherit numlockx;
})
./01-sysconfdir-install.patch
./hardcode-theme.patch
];

mesonFlags = [
@@ -70,9 +71,6 @@ stdenv.mkDerivation rec {

preFixup = ''
gappsWrapperArgs+=(
# GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here
--prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc"
# dbus-launch needed in path
--prefix PATH : "${dbus}/bin"
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ index 2450c1a..a908d11 100644
conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
conf_data.set('GETTEXT_PACKAGE', meson.project_name())
-conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
+conf_data.set('GSD_DIR', '@elementary-settings-daemon@')
+conf_data.set('GSD_DIR', '@elementary_settings_daemon@')
conf_data.set('VERSION', meson.project_version())
config_header = configure_file (
input: 'config.vala.in',
15 changes: 15 additions & 0 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
index 11aa4c0..daf4a8a 100644
--- a/src/PantheonGreeter.vala
+++ b/src/PantheonGreeter.vala
@@ -474,6 +474,10 @@ public static int main (string [] args) {
Gdk.CursorType.LEFT_PTR);
Gdk.get_default_root_window ().set_cursor (cursor);

+ var settings = Gtk.Settings.get_default ();
+ settings.gtk_icon_theme_name = "elementary";
+ settings.gtk_theme_name = "elementary";
+
var icon_theme = Gtk.IconTheme.get_default ();
icon_theme.add_resource_path ("/io/elementary/greeter/icons");

4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.04.01";
version = "2019.04.07";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm";
sha256 = "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k";
};

nativeBuildInputs = [ makeWrapper ];