diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-08-25 17:55:09 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-08-25 17:55:09 +0000 |
| commit | 988a1f1ef36ac7db11ef546cc0bb00afcabb5a25 (patch) | |
| tree | ae7fa491f00e56ff3b3380b120865686a0117e6e | |
| parent | 956a4e1ed239f52f542ae9cf7db1bc00000770eb (diff) | |
| download | nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar.gz nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar.bz2 nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar.lz nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar.xz nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.tar.zst nixpkgs-988a1f1ef36ac7db11ef546cc0bb00afcabb5a25.zip | |
One more bison inheritance fix
svn path=/nixpkgs/trunk/; revision=12713
| -rw-r--r-- | pkgs/applications/window-managers/stumpwm/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index a0957c1c797..ab123a03559 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -29,6 +29,7 @@ rec { ensureDir $out/share/stumpwm/lisp cp stumpwm $out/bin + cp contrib/stumpish $out/bin || true cp sample-stumpwmrc.lisp $out/share/stumpwm/doc cp stumpwm.info $out/share/info diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98c0b36c77d..7622b9b45ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7151,7 +7151,7 @@ let pkgs = rec { xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline saneBackends chmlib python libzip gmp sqlite libidn runCommand lib openbabel ocaml facile stdenv jasper fam indilib libnova - libarchive dbus; + libarchive dbus bison; #flac = builtins.getAttr "1.1.2" flacAlts; cdparanoia = cdparanoiaIII; inherit (xlibs) @@ -7159,7 +7159,7 @@ let pkgs = rec { xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc - libxkbfile libXinerama bison; + libxkbfile libXinerama; inherit (gtkLibs) glib; qt = qt4; openexr = openexr_1_6_1 ; |