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: dc8c798e5db1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f6b1dca5837
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 11, 2017

  1. fltk: 1.3.3 -> 1.3.4 

    This incidentally fixes the build on darwin.
    @acowley
    acowley committed May 11, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0dbf5b0 View commit details

Commits on May 19, 2017

  1. Merge #25708: fltk: 1.3.3 -> 1.3.4

    @vcunat
    vcunat committed May 19, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9f6b1dc View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/development/libraries/fltk/default.nix
10 changes: 2 additions & 8 deletions pkgs/development/libraries/fltk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,21 +6,15 @@

let inherit (composableDerivation) edf; in

let version = "1.3.3"; in
let version = "1.3.4"; in
composableDerivation.composableDerivation {} {
name = "fltk-${version}";

src = fetchurl {
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq";
sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8";
};

# http://www.fltk.org/str.php?L3156
postPatch = ''
substituteInPlace FL/x.H \
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
'';

patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];

nativeBuildInputs = [ pkgconfig ];