diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
| commit | 07bf828bd96591b302bd0a05edee48d2f4834efb (patch) | |
| tree | 22f053f5aaa4243c47d887237fa1f1d59b10d6f5 /pkgs/misc | |
| parent | 99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529 (diff) | |
| parent | d442a0ffc0ad7e33fa0fddaf0365caf80193a224 (diff) | |
Merge branch 'staging'; security /cc #21642
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 5 | ||||
| -rw-r--r-- | pkgs/misc/themes/orion/default.nix | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 66ea152b2744a..d556f94b78cbe 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,6 +1,7 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, - pkgconfig, fontforge, makeWrapper, flex, bison, + # flex 2.6.3 causes: undefined reference to `yywrap' + pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison, supportFlags, buildScript ? null, configureFlags ? "" }: @@ -16,7 +17,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { inherit name src configureFlags; nativeBuildInputs = [ - pkgconfig fontforge makeWrapper flex bison + pkgconfig fontforge makeWrapper flex_2_6_1 bison ]; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix index 4872d62ae5124..9ba8cd368cf79 100644 --- a/pkgs/misc/themes/orion/default.nix +++ b/pkgs/misc/themes/orion/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - phases = "$prePhases unpackPhase installPhase fixupPhase $postPhases"; installPhase = '' mkdir -p $out/share/themes/orion cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion |