Commit Graph

49 Commits

Author SHA1 Message Date
Artturin
a584822577 treewide: fix fallout from 'cmake/setup-hook.sh: Don't skip build-RPATH'
f7414e2
2022-07-15 02:50:09 +03:00
Rick van Schijndel
d620787dd7 fltk: support cross-compilation
Disabling building tests when cross-compiling, since it gives a build fail.
2022-05-10 06:45:52 +02:00
Vladimír Čunát
5e862dc729
fltk: don't build PDF docs
- it was broken, probably after doxygen update:
  https://hydra.nixos.org/build/171898654
- HTML is more than enough nowadays, I believe
- the texlive-medium build-dep was relatively expensive
2022-04-04 19:13:44 +02:00
OPNA2608
64d7b2b59e fltk14: 1.4.x-2021-07-04 -> 1.4.x-2021-12-21 2021-12-23 13:34:12 +01:00
OPNA2608
44b49e1b6c fltk13: 1.3.6 -> 1.3.8 2021-12-23 13:34:12 +01:00
OPNA2608
9fffabf9ee fltk*: Refactor, fltk14: 1.4.x-r13121 -> 1.4.x-2021-07-04 2021-07-12 12:22:15 +02:00
OPNA2608
05aa9f6b1c fltk13: 1.3.5 -> 1.3.6 2021-07-09 07:27:29 +02:00
Matthew Leach
950e2a7efd fltk14: fix build on apple silicon
For some reason having a file called `VERSION` in the package root directory
appears to be interfering with the build process:

```
Compiling Fl_cocoa.mm...
In file included from Fl_cocoa.mm:39:
In file included from ../FL/x.H:32:
In file included from ../FL/mac.H:50:

[...]

In file included from /nix/store/xhvrrnz8n6dxizgig46ijh59m7mfy261-libcxx-11.1.0-dev/include/c++/v1/cstddef:37:
../version:1:1: error: expected unqualified-id
1.4.0
^
```

By removing the file, the build succeeds.
2021-07-08 22:26:29 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Frederik Rietdijk
be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
adisbladis
803f9cce9d
fltk: Don't use libGLU_combined 2019-11-09 10:34:52 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Daiderd Jordan
91b595945e
fltk: remove cf-private 2019-07-03 22:20:14 +02:00
R. RyanTM
29e03caeeb fltk: 1.3.4 -> 1.3.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fltk/versions
2019-03-10 03:12:42 -07:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Chris Martin
97cd07e322 fltk: add version 1.4.x-r13121 2018-11-21 16:06:22 +01:00
Daiderd Jordan
78623f492c
fltk: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          fl_open_display() in Fl_cocoa.o
          fl_ready() in Fl_cocoa.o
          fl_wait(double) in Fl_cocoa.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in Fl_cocoa.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in Fl_Sys_Menu_Bar.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in Fl_cocoa.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in Fl_cocoa.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in Fl_Native_File_Chooser_MAC.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:24 +01:00
Frederik Rietdijk
497679725e fltk: get rid of composableDerivation 2018-07-11 18:02:49 +02:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Anthony Cowley
0dbf5b02b9 fltk: 1.3.3 -> 1.3.4
This incidentally fixes the build on darwin.
2017-05-11 12:08:25 -04:00
Dmitry Kalinkin
e35ddbec13
fltk: fix on darwin
Compiling Fl_cocoa.mm...
Fl_cocoa.mm:4079:30: error: use of undeclared identifier 'version'; did
you mean 'Fl::version'?
    NSOperatingSystemVersion version = [[NSProcessInfo processInfo]
operatingSystemVersion];
                             ^~~~~~~
                             Fl::version
../FL/Fl.H:262:17: note: 'Fl::version' declared here
  static double version();
                ^
Fl_cocoa.mm:4079:5: error: use of undeclared identifier
'NSOperatingSystemVersion'
    NSOperatingSystemVersion version = [[NSProcessInfo processInfo]
operatingSystemVersion];
    ^
Fl_cocoa.mm:4080:9: error: use of undeclared identifier 'version'
    M = version.majorVersion;
        ^
Fl_cocoa.mm:4081:9: error: use of undeclared identifier 'version'
    m = version.minorVersion;
        ^
Fl_cocoa.mm:4082:9: error: use of undeclared identifier 'version'
    b = version.patchVersion;
        ^
5 errors generated.
2016-10-23 21:19:14 -04:00
Anthony Cowley
fbf41c6c7f fltk: darwin compatibility 2016-07-14 16:14:09 -04:00
Vladimír Čunát
34e558274d fltk13: xftSupport = true by default
It seems often desired.
2016-05-26 10:38:17 +02:00
Vladimír Čunát
e5c500475c fltk13: various fixups 2016-05-26 10:35:29 +02:00
Julien Dehos
2607b53e9d fltk: 2-alpha -> 1.3.3 2016-05-23 08:37:19 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Vladimír Čunát
6cc8869f38 fltk13: fix a bug preventing use in octave
Fixes #8007 (together with the parent commit).
2015-05-28 13:16:02 +02:00
Vladimír Čunát
adea54614d fltk13, octave: expose fltk13 config and override in octave
Octave needs fltk with libxft, see #8007.

I'm not much familiar with composableDerivation,
so perhaps this change could be done in a better way...
2015-05-28 13:16:02 +02:00
Michael Raskin
86da6fae74 Update fltk to 1.3.3; apparently it includes most of the old patch now 2015-05-21 19:48:25 +03:00
Marc Weber
577c20c23b tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)

Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
2014-01-28 16:10:12 +01:00
Michael Raskin
af9db522cf Update FLTK and TigerVNC; doesn't fix TigerVNC Xvnc build per se 2014-01-01 01:36:57 +04:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Lluís Batlle i Rossell
f0e4e770f0 fltk: updating, the old url didn't work. 2012-07-02 22:26:38 +02:00
Yury G. Kudryashov
046ddeb32a fltk-1.3.0
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Cillian de Roiste
fa84d216b0 Updating the snapshot for fltk, r6970 is no longer available
svn path=/nixpkgs/trunk/; revision=26745
2011-04-07 21:36:12 +00:00
Eelco Dolstra
f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Lluís Batlle i Rossell
a2e353cd50 Adding htmldoc. I had to update fltk 1.1 for it to build.
svn path=/nixpkgs/trunk/; revision=22096
2010-06-01 21:15:40 +00:00
Michael Raskin
1771bf0051 Update fltk
svn path=/nixpkgs/trunk/; revision=20781
2010-03-23 13:00:06 +00:00
Lluís Batlle i Rossell
19ac94dee3 Adding cinepaint 0.22.1 and as a dependency, also fltk 1.1.9
svn path=/nixpkgs/trunk/; revision=14841
2009-04-02 15:20:19 +00:00
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber
e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Marc Weber
232d0afe8e fltk version bump 2.0.x-r6483
svn path=/nixpkgs/trunk/; revision=13123
2008-10-26 20:29:47 +00:00
Marc Weber
fb437cf98d exrviewer added (needs ctl openexr openexr_ctl)
fltk update
ilmbase updated
ndiswrapper does compile but has to be integrated into the kernel somehow

svn path=/nixpkgs/trunk/; revision=9863
2007-12-05 21:25:47 +00:00
Marc Weber
3e6eebc6e5 fltk-2.0
svn path=/nixpkgs/trunk/; revision=9171
2007-08-20 10:42:09 +00:00