diff options
Diffstat (limited to 'pkgs/development/libraries/freedesktop')
18 files changed, 9 insertions, 60 deletions
diff --git a/pkgs/development/libraries/freedesktop/libICE/builder.sh b/pkgs/development/libraries/freedesktop/libICE/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/libraries/freedesktop/libICE/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libICE/default.nix b/pkgs/development/libraries/freedesktop/libICE/default.nix index 58dc8794c1809..6ff2e8519978f 100644 --- a/pkgs/development/libraries/freedesktop/libICE/default.nix +++ b/pkgs/development/libraries/freedesktop/libICE/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, pkgconfig, libX11}: -derivation { +stdenv.mkDerivation { name = "libICE-6.3.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2; md5 = "06db02e3df846b127a6e2dc3e345039c"; }; buildInputs = [pkgconfig libX11]; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/libSM/builder.sh b/pkgs/development/libraries/freedesktop/libSM/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/libraries/freedesktop/libSM/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/freedesktop/libSM/default.nix index d60b03c1dac28..ed1765fa36395 100644 --- a/pkgs/development/libraries/freedesktop/libSM/default.nix +++ b/pkgs/development/libraries/freedesktop/libSM/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, pkgconfig, libX11, libICE}: -derivation { +stdenv.mkDerivation { name = "libSM-6.0.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2; @@ -10,5 +9,4 @@ derivation { }; buildInputs = [pkgconfig]; propagatedBuildInputs = [libX11 libICE]; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/libX11/builder.sh b/pkgs/development/libraries/freedesktop/libX11/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/libraries/freedesktop/libX11/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/freedesktop/libX11/default.nix index dc95abe5102a2..69a6ea554ae83 100644 --- a/pkgs/development/libraries/freedesktop/libX11/default.nix +++ b/pkgs/development/libraries/freedesktop/libX11/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, pkgconfig, xproto, xextensions, libXtrans, libXau}: -derivation { +stdenv.mkDerivation { name = "libX11-6.2.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2; @@ -10,5 +9,4 @@ derivation { }; buildInputs = [pkgconfig]; propagatedBuildInputs = [xproto xextensions libXtrans libXau]; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/libXau/builder.sh b/pkgs/development/libraries/freedesktop/libXau/builder.sh deleted file mode 100755 index dc844d758a83a..0000000000000 --- a/pkgs/development/libraries/freedesktop/libXau/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. $stdenv/setup - -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libXau/default.nix b/pkgs/development/libraries/freedesktop/libXau/default.nix index be6d6e262c0aa..894f0d5a088f8 100644 --- a/pkgs/development/libraries/freedesktop/libXau/default.nix +++ b/pkgs/development/libraries/freedesktop/libXau/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, pkgconfig, xproto}: -derivation { +stdenv.mkDerivation { name = "libXau-0.1.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2; md5 = "3d747ada4a7d17538fa21c62d5608656"; }; buildInputs = [pkgconfig xproto]; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/libXt/builder.sh b/pkgs/development/libraries/freedesktop/libXt/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/libraries/freedesktop/libXt/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/freedesktop/libXt/default.nix index 5d2e62c8c33f0..0645a18446ed9 100644 --- a/pkgs/development/libraries/freedesktop/libXt/default.nix +++ b/pkgs/development/libraries/freedesktop/libXt/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, pkgconfig, libX11, libSM, patch}: -derivation { +stdenv.mkDerivation { name = "libXt-0.1.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2; @@ -11,5 +10,4 @@ derivation { buildInputs = [pkgconfig libX11 libSM patch]; # This patch should become unnecessary soon; already been fixed in CVS. patches = [./patch]; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/libXtrans/builder.sh b/pkgs/development/libraries/freedesktop/libXtrans/builder.sh deleted file mode 100755 index dc844d758a83a..0000000000000 --- a/pkgs/development/libraries/freedesktop/libXtrans/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. $stdenv/setup - -genericBuild diff --git a/pkgs/development/libraries/freedesktop/libXtrans/default.nix b/pkgs/development/libraries/freedesktop/libXtrans/default.nix index b5f9eb590b5bb..a706397e085a6 100644 --- a/pkgs/development/libraries/freedesktop/libXtrans/default.nix +++ b/pkgs/development/libraries/freedesktop/libXtrans/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "libXtrans-0.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2; md5 = "a5ae4c7a75f930053b8327f7bd0c1361"; }; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/xextensions/builder.sh b/pkgs/development/libraries/freedesktop/xextensions/builder.sh deleted file mode 100755 index dc844d758a83a..0000000000000 --- a/pkgs/development/libraries/freedesktop/xextensions/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. $stdenv/setup - -genericBuild diff --git a/pkgs/development/libraries/freedesktop/xextensions/default.nix b/pkgs/development/libraries/freedesktop/xextensions/default.nix index f22195154b983..eac4b89ab3f85 100644 --- a/pkgs/development/libraries/freedesktop/xextensions/default.nix +++ b/pkgs/development/libraries/freedesktop/xextensions/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "xextensions-1.0.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2; md5 = "e61bca2a4757b736c9557dc8a7df2217"; }; - inherit stdenv; } diff --git a/pkgs/development/libraries/freedesktop/xlibs/builder.sh b/pkgs/development/libraries/freedesktop/xlibs/builder.sh index f1230bed2d8a4..abcab635a6082 100755..100644 --- a/pkgs/development/libraries/freedesktop/xlibs/builder.sh +++ b/pkgs/development/libraries/freedesktop/xlibs/builder.sh @@ -1,4 +1,3 @@ -#! /bin/sh -e . $stdenv/setup dontMake=1 dontMakeInstall=1 diff --git a/pkgs/development/libraries/freedesktop/xlibs/default.nix b/pkgs/development/libraries/freedesktop/xlibs/default.nix index a5ef56ba46c7b..d1b7dc4476ce0 100644 --- a/pkgs/development/libraries/freedesktop/xlibs/default.nix +++ b/pkgs/development/libraries/freedesktop/xlibs/default.nix @@ -1,11 +1,9 @@ {stdenv, libX11, libXt}: -derivation { +stdenv.mkDerivation { name = "xlib-1.0"; - system = stdenv.system; builder = ./builder.sh; propagatedBuildInputs = [libX11 libXt]; - inherit stdenv; } // { # For compatability with XFree86. buildClientLibs = true; diff --git a/pkgs/development/libraries/freedesktop/xproto/builder.sh b/pkgs/development/libraries/freedesktop/xproto/builder.sh deleted file mode 100755 index dc844d758a83a..0000000000000 --- a/pkgs/development/libraries/freedesktop/xproto/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. $stdenv/setup - -genericBuild diff --git a/pkgs/development/libraries/freedesktop/xproto/default.nix b/pkgs/development/libraries/freedesktop/xproto/default.nix index 008590ef43df1..6cfea9548025c 100644 --- a/pkgs/development/libraries/freedesktop/xproto/default.nix +++ b/pkgs/development/libraries/freedesktop/xproto/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "xproto-6.6.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2; md5 = "8a7546a607dcd61b2ee595c763fd7f85"; }; - inherit stdenv; } |