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

Commits on Jun 9, 2019

  1. uae: fixup build 

    Fixes #62341.  I'm not sure why the problem happened,
but the solution seems fairly simple and risk-free.

(cherry picked from commit e596a33)
    @vcunat
    vcunat committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58f7a0d View commit details

  2. Merge #62340: filezilla: add wrapper to set necessary FZ_DATADIR 

    (cherry picked from commit 4093d64)
    @vcunat
    vcunat committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb56ef1 View commit details
Showing with 11 additions and 2 deletions.
  1. +10 −2 pkgs/applications/networking/ftp/filezilla/default.nix
  2. +1 −0 pkgs/misc/emulators/uae/default.nix
12 changes: 10 additions & 2 deletions pkgs/applications/networking/ftp/filezilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle
, makeWrapper
}:

let version = "3.31.0"; in
stdenv.mkDerivation {
@@ -17,7 +19,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite
pugixml libfilezilla nettle ];
pugixml libfilezilla nettle makeWrapper ];

enableParallelBuilding = true;

postInstall = ''
wrapProgram $out/bin/filezilla --set FZ_DATADIR $out
'';

meta = with stdenv.lib; {
homepage = https://filezilla-project.org/;
1 change: 1 addition & 0 deletions pkgs/misc/emulators/uae/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2 alsaLib SDL ];

hardeningDisable = [ "format" ];
LDFLAGS = [ "-lm" ];

meta = {
description = "Ultimate/Unix/Unusable Amiga Emulator";