diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:24:26 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:24:26 +0000 |
| commit | bbe62e266b127e7e99a5c2aee95ad96f9c55c03c (patch) | |
| tree | 4f7d5582fd5f5bbd5a7102424404a3ff7531c0e4 /pkgs/development/libraries/xlibs-wrapper | |
| parent | 7a79d1ff6a6a0b342cc33aff94446af601a825b2 (diff) | |
| download | nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar.gz nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar.bz2 nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar.lz nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar.xz nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.tar.zst nixpkgs-bbe62e266b127e7e99a5c2aee95ad96f9c55c03c.zip | |
* Remove references to dontMakeInstall.
svn path=/nixpkgs/trunk/; revision=7500
Diffstat (limited to 'pkgs/development/libraries/xlibs-wrapper')
| -rw-r--r-- | pkgs/development/libraries/xlibs-wrapper/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/xlibs-wrapper/default.nix | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/libraries/xlibs-wrapper/builder.sh b/pkgs/development/libraries/xlibs-wrapper/builder.sh index 7e40acf9198..273fc55c755 100644 --- a/pkgs/development/libraries/xlibs-wrapper/builder.sh +++ b/pkgs/development/libraries/xlibs-wrapper/builder.sh @@ -1,8 +1,2 @@ source $stdenv/setup -dontBuild=1 -dontMakeInstall=1 -nop() { - sourceRoot=. -} -unpackPhase=nop genericBuild diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 2593eef158c..91c1446ef20 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; - builder = ./builder.sh; + buildPhase = "true"; + installPhase = "true"; + unpackPhase = "sourceRoot=."; propagatedBuildInputs = packages; } // { # For compatability with XFree86. |