diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
| commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
| tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/development/libraries/gtk+/1.2.x.nix | |
| parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
| parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
| download | nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip | |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/development/libraries/gtk+/1.2.x.nix')
| -rw-r--r-- | pkgs/development/libraries/gtk+/1.2.x.nix | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gtk+/1.2.x.nix b/pkgs/development/libraries/gtk+/1.2.x.nix deleted file mode 100644 index 9f6d8b7881e8..000000000000 --- a/pkgs/development/libraries/gtk+/1.2.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, x11, glib}: - -stdenv.mkDerivation { - name = "gtk+-1.2.10"; - - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz; - md5 = "4d5cb2fc7fb7830e4af9747a36bfce20"; - }; - - propagatedBuildInputs = [x11 glib]; -} |