diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 09:01:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 09:05:22 +0200 |
| commit | 68c003b256ad6a5abff2e36ebcf0e96320bca416 (patch) | |
| tree | da38c617bd7b6ca953348461f975a580bec9a3bb /pkgs/development/libraries/motif | |
| parent | a1bef771ee6cf120e3073b28961f160e221bc25b (diff) | |
| download | nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar.gz nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar.bz2 nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar.lz nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar.xz nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.tar.zst nixpkgs-68c003b256ad6a5abff2e36ebcf0e96320bca416.zip | |
motif: fixup build after automake update #28232
It seemed easiest to avoid the need to autoreconf.
Diffstat (limited to 'pkgs/development/libraries/motif')
| -rw-r--r-- | pkgs/development/libraries/motif/Do-not-compile-demos.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/motif/default.nix | 13 |
2 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/libraries/motif/Do-not-compile-demos.patch b/pkgs/development/libraries/motif/Do-not-compile-demos.patch deleted file mode 100644 index 1b8df94d007..00000000000 --- a/pkgs/development/libraries/motif/Do-not-compile-demos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -27,7 +27,6 @@ SUBDIRS = bindings bitmaps \ - include \ - tools \ - clients \ -- doc \ -- demos -+ doc - AUTOMAKE_OPTIONS = 1.4 - ACLOCAL_AMFLAGS = -I . diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 1f86af0a2e8..c57353ccbd4 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -3,7 +3,7 @@ , expat, libjpeg, libpng, libiconv , flex , libXp, libXau -, demoSupport ? false, autoconf, automake +, demoSupport ? false }: # refer to the gentoo package @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { expat libjpeg libpng libiconv ]; - nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ]; + nativeBuildInputs = [ pkgconfig flex ]; propagatedBuildInputs = [ libXp libXau ]; @@ -30,13 +30,16 @@ stdenv.mkDerivation rec { makeFlags = [ "CFLAGS=-fno-strict-aliasing" ]; - prePatch = ''rm lib/Xm/Xm.h''; + prePatch = '' + rm lib/Xm/Xm.h + '' + stdenv.lib.optionalString (!demoSupport) '' + sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} + ''; patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch ./Use-correct-header-for-malloc.patch ./Add-X.Org-to-bindings-file.patch - ] - ++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch; + ]; meta = with stdenv.lib; { homepage = http://motif.ics.com; |