diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-05 13:04:18 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-05 13:04:18 +0200 |
commit | 1da6a7d4a915e48934fbaa27fe01db1211d00df7 (patch) | |
tree | 0f2d493f5b85054172ddae42ad3eadeddb5e24c6 | |
parent | 246edc3df2ade0701aabc53e41d6c8c85f51ac24 (diff) | |
download | nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar.gz nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar.bz2 nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar.lz nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar.xz nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.tar.zst nixlib-1da6a7d4a915e48934fbaa27fe01db1211d00df7.zip |
Remove illegal meta.src attributes
-rw-r--r-- | pkgs/applications/audio/ladspa-plugins/ladspah.nix | 33 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/ldcpp/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/qi/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/construo/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/orbit/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/dict/dictd-db.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/xmpp/openfire/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/filesystems/relfs/default.nix | 1 |
8 files changed, 11 insertions, 29 deletions
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 30ba34af16c5..8c4d8a8c1ed5 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -1,28 +1,17 @@ -{ stdenv, fetchurl, builderDefs }: +{ runCommand, fetchurl }: + +let -let src = fetchurl { url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt; sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; }; + in - let localDefs = builderDefs.passthru.function { - buildInputs = []; - inherit src; - }; - in with localDefs; -let - copyFile = fullDepEntry (" - mkdir -p \$out/include - cp ${src} \$out/include/ladspa.h - ") [minInit defEnsureDir]; -in -stdenv.mkDerivation { - name = "ladspa.h"; - builder = writeScript "ladspa.h-builder" - (textClosure localDefs [copyFile]); - meta = { - description = "LADSPA format audio plugins"; - inherit src; - }; -} + +runCommand "ladspa.h" + { meta.description = "LADSPA format audio plugins"; } + '' + mkdir -p $out/include + cp ${src} $out/include/ladspa.h + '' diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 1b601992aa6f..6f282b30fa14 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { [doScons doForceShare doPropagate]); meta = { description = "Linux DC++ - Direct Connect client"; - inherit src; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ae0172558549..ecb022d942a9 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { description = "Qi - next generation on top of Common Lisp"; - inherit src; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 4de74bde5a11..57d055ed3d3d 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "Construo masses and springs simulation"; - inherit src; }; } diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 9769e6f5d670..de4c84f010cd 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { [ customBuild doForceShare doPropagate]); meta = { description = "Orbit space flight simulator"; - inherit src; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index c6c0bc73a08a..5f109c58e6e4 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { [doInstall doForceShare doPropagate]); meta = { description = "${name} dictionary for dictd"; - inherit src; }; }; # Probably a bug in some FreeDict release files, but easier to trivially diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index e5e5273783f8..736517b53f19 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { [ installPhase doForceShare doPropagate]); meta = { description = "XMPP server in Java"; - inherit src; }; } diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 56dad0c1e3dd..6d803f725318 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { (textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "A relational filesystem on top of FUSE"; - inherit src; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; |