diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-06-20 06:52:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-20 06:52:11 +0000 |
commit | ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4 (patch) | |
tree | 39abb119688564a6c4581ea34173567313fdf714 | |
parent | 7eb332af5d6e4ed76030f84d68bb62eaca7fdac2 (diff) | |
parent | 1a5d2e29c5b6cfaa159db926cd3def3bb62635b9 (diff) | |
download | nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar.gz nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar.bz2 nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar.lz nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar.xz nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.tar.zst nixpkgs-ffd9bf7e2929ec94ee3f8f3ec7b0d889eec302b4.zip |
Merge pull request #63060 from layus/gtk-demos
gtk3: re-enable demos
-rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 21f1d4c3999..378f3904d5d 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -53,8 +53,9 @@ stdenv.mkDerivation rec { ++ optional cupsSupport cups; #TODO: colord? - # demos fail to install, no idea where's the problem - preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; + ## (2019-06-12) Demos seem to install fine now. Keeping this around in case it fails again. + ## (2014-03-27) demos fail to install, no idea where's the problem + #preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; enableParallelBuilding = true; |