diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-10-18 22:32:27 +0300 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-10-18 22:34:27 +0300 |
| commit | 745a08d4c4f55106efea1d989c257495c9b8d992 (patch) | |
| tree | 2d12d5fa316c37cfb82312428f0ffff9e5b0353c | |
| parent | f5f1bfa30a37784222fac84c422f595273f8ef5d (diff) | |
| download | nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar.gz nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar.bz2 nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar.lz nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar.xz nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.tar.zst nixpkgs-745a08d4c4f55106efea1d989c257495c9b8d992.zip | |
libtxc_dxtn: get rid of duplicate package, clean up build script.
| -rw-r--r-- | pkgs/development/libraries/libtxc_dxtn/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxtc_dxtn/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 9cf8decf4c8..33e01f86dac 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa }: +{ stdenv, fetchurl, autoreconfHook, mesa }: let version = "1.0.1"; in @@ -6,15 +6,14 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-${version}"; src = fetchurl { - url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz"; - sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv"; + url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - buildInputs = [ autoconf automake libtool mesa ]; - - preConfigure = "autoreconf -vfi"; + buildInputs = [ autoreconfHook mesa ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; + repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; }; } diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix deleted file mode 100644 index 1f94bcbef99..00000000000 --- a/pkgs/development/libraries/libxtc_dxtn/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, mesa }: - -stdenv.mkDerivation rec { - name = "libtxc_dxtn-1.0.1"; - - src = fetchurl { - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; - sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; - }; - - NIX_CFLAGS_COMPILE = "-I ${mesa}/include"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f7cb59d5e..3bfa1e815ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5099,8 +5099,6 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { inherit fetchurl stdenv; }); |